From 0a8b731d9cf46c78c0c4c66fa9954eeb262e4017 Mon Sep 17 00:00:00 2001
From: luliqiang <kidgrow>
Date: Mon, 10 Aug 2020 09:20:50 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.2.240:7070/r/kidgrow-microservices-platform into dev
---
kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/resources/mapper/SysRoleOrganizationMapper.xml | 69 +++++++++++++++++++++++-----------
1 files changed, 46 insertions(+), 23 deletions(-)
diff --git a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/resources/mapper/SysRoleOrganizationMapper.xml b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/resources/mapper/SysRoleOrganizationMapper.xml
index bbcdfe1..fa9564d 100644
--- a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/resources/mapper/SysRoleOrganizationMapper.xml
+++ b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/resources/mapper/SysRoleOrganizationMapper.xml
@@ -6,48 +6,71 @@
<!--定义数据权限的查询-->
<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 == 1">
+ <if test="itemto.flag">
+ </if>
+ <if test="!itemto.flag">
+ or ( is_del = 0 and enabled=1)
+ </if>
+ </when>
<when test="inx==2">
- AND
- <foreach item="itemtoto" collection="itemto" separator="or" open="(" close=")" index="">
- create_user_org_code like '${itemtoto.orgCode}%'
- </foreach>
+ <if test="itemto.flag">
+ AND
+ <foreach item="itemtoto" collection="itemto.object" separator="or" open="(" close=")"
+ index="">
+ create_user_org_code = #{itemtoto.orgCode}
+ </foreach>
+ </if>
+ <if test="!itemto.flag">
+ or (
+ <foreach item="itemtoto" collection="itemto.object" separator="or" open="(" close=")"
+ index="">
+ create_user_org_code = #{itemtoto.orgCode}
+ </foreach>
+ and is_del = 0 and enabled=1
+ )
+ </if>
</when>
<when test="inx == 3">
- AND
- <foreach item="itemtoto" collection="itemto" separator="or" open="(" close=")" index="">
- create_user_org_code = #{itemtoto.orgCode}
- </foreach>
+ <if test="itemto.flag">
+ AND
+ create_user_org_code = #{itemto.object}
+ </if>
+ <if test="!itemto.flag">
+ or (create_user_org_code = #{itemto.object} and is_del = 0 and enabled=1)
+ </if>
</when>
<when test="inx == 4">
- AND
- <foreach item="itemtoto" collection="itemto" separator="or" open="(" close=")" index="">
- create_user_org_code like '${itemtoto.orgCode}%'
- </foreach>
+ <if test="itemto.flag">
+ AND
+ create_user_org_code like '${itemto.object}%'
+ </if>
+ <if test="!itemto.flag">
+ or (create_user_org_code like '${itemto.object}%' and is_del = 0 and enabled=1)
+ </if>
</when>
<when test="inx == 5">
- AND
- <foreach item="itemtoto" collection="itemto" separator="or" open="(" close=")" index="">
- create_user_id = #{itemtoto.orgCode}
- </foreach>
+ <if test="itemto.flag">
+ AND
+ create_user_id = #{itemto.object}
+ </if>
+ <if test="!itemto.flag">
+ or (create_user_id = #{itemto.object} and is_del = 0 and enabled=1)
+ </if>
</when>
<otherwise>
AND id is null
</otherwise>
</choose>
-
</foreach>
</foreach>
</if>
- </sql>
-
+ </sql>
+
<!--定义查询列-->
<sql id="Column_List">
*
--
Gitblit v1.8.0