From e6a149ea753350d3bebbd76ce40315a8b6016b4e Mon Sep 17 00:00:00 2001
From: bingbing <zhaobingliang@aliyun.com>
Date: Thu, 23 Jul 2020 13:04:47 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.2.240:7070/r/kidgrow-microservices-platform into dev

---
 kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/SysProductMapper.xml |   49 +++++++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 47 insertions(+), 2 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..1707b3c 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
@@ -4,8 +4,52 @@
 <mapper namespace="com.kidgrow.oprationcenter.mapper.SysProductMapper">
     <!--定义查询列-->
     <sql id="Column_List">
-	   *
+	  DISTINCT *
 	</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