From 6557baac627dce769c2b05ab482e4daf262a88ac Mon Sep 17 00:00:00 2001
From: houruijun <411269194@kidgrow.com>
Date: Wed, 17 Jun 2020 17:34:01 +0800
Subject: [PATCH] 1.增加工具类 MultipartFileUtils ,支持将MultipartFile类型转换为file类型 2.增加缩略图相关全局配置变量:宽高和生成缩略图的暂存目录(缩略图上传成功后会删除) 3.修改文件上传中心的上传代码,将生成目录和aliyun上传方法抽离独立 4.增加医院logo上传支持接口(可返回缩略图地址) 5.修改登录后回去用户信息不完整bug

---
 kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/SysProductMapper.xml |   47 ++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 46 insertions(+), 1 deletions(-)

diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/SysProductMapper.xml b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/SysProductMapper.xml
index e015f6f..3aa7b4f 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/SysProductMapper.xml
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/SysProductMapper.xml
@@ -6,6 +6,50 @@
     <sql id="Column_List">
 	   *
 	</sql>
+    <!--定义数据权限的查询-->
+    <sql id="Role_Organization">
+        <if test="p.roleOrg != null and p.roleOrg.size>0">
+
+            <foreach item="item" collection="p.roleOrg" index="">
+                <foreach item="itemto" collection="item" index="inx">
+
+
+                    <choose>
+                        <when test="inx == 1"></when>
+
+                        <when test=" inx ==2">
+                            AND
+                            <foreach item="itemtoto" collection="itemto" separator="or" open="(" close=")" index="">
+                                create_user_org_code like '${itemtoto.orgCode}%'
+                            </foreach>
+                        </when>
+                        <when test="inx == 3">
+                            AND
+                            <foreach item="itemtoto" collection="itemto" separator="or" open="(" close=")" index="">
+                                create_user_org_code = #{itemtoto.orgCode}
+                            </foreach>
+                        </when>
+                        <when test="inx == 4">
+                            AND
+                            <foreach item="itemtoto" collection="itemto" separator="or" open="(" close=")" index="">
+                                create_user_org_code like '${itemtoto.orgCode}%'
+                            </foreach>
+                        </when>
+                        <when test="inx == 5">
+                            AND
+                            <foreach item="itemtoto" collection="itemto" separator="or" open="(" close=")" index="">
+                                create_user_id = #{itemtoto.orgCode}
+                            </foreach>
+                        </when>
+                        <otherwise>
+                            AND id is null
+                        </otherwise>
+                    </choose>
+
+                </foreach>
+            </foreach>
+        </if>
+    </sql>
 
     <!--sql查询片段-->
     <sql id="where">
@@ -16,7 +60,7 @@
                 and id = #{p.id}
             </if>
             <if test="p.proName != null and p.proName !=''">
-                and pro_name = #{p.proName}
+                and pro_name like concat('%', #{p.proName}, '%')
             </if>
             <if test="p.proTime != null and p.proTime !=''">
                 and pro_time = #{p.proTime}
@@ -57,6 +101,7 @@
             <if test="p.updateTime != null and p.updateTime !=''">
                 and update_time = #{p.updateTime}
             </if>
+            <include refid="Role_Organization"></include>
         </where>
     </sql>
 

--
Gitblit v1.8.0