From 2238a2cbcfcda5949508143aced71bf00139d612 Mon Sep 17 00:00:00 2001
From: dimengzhe <251008545@qq.com>
Date: Sun, 27 Nov 2022 15:14:44 +0800
Subject: [PATCH] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E4=B8=8B=E4=B8=80=E7=8E=AF?=
 =?UTF-8?q?=E8=8A=82=E7=94=A8=E6=88=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../portal/biz/sysuser/SysUserMapper.java     |  2 ++
 .../portal/biz/sysuser/SysUserMapper.xml      | 35 ++++++++++++++-----
 .../portal/biz/sysuser/SysUserService.java    |  8 +++++
 3 files changed, 36 insertions(+), 9 deletions(-)

diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserMapper.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserMapper.java
index d4140a5b52..c877f57dbd 100644
--- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserMapper.java
+++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserMapper.java
@@ -182,4 +182,6 @@ public interface SysUserMapper extends BaseMapper<SysUser> {
     int updateAppIdAll();
 
     String selectIdBySid(@Param("list") List<String> stringList);
+
+    List<SysUserVo> getUserMessageByRole(@Param("roleSid") String roleSid,@Param("levelOrgSid") String levelOrgSid, @Param("list") List<String> stringList);
 }
\ No newline at end of file
diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserMapper.xml b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserMapper.xml
index ef9e2318c1..99bd1acb13 100644
--- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserMapper.xml
+++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserMapper.xml
@@ -113,15 +113,16 @@
     <select id="selectByUserName" resultType="com.yxt.anrui.portal.api.sysuser.SysUser">
         SELECT su.*
         FROM sys_user su
-        left join sys_staffinfo si on si.sid = su.staffSid
+                 left join sys_staffinfo si on si.sid = su.staffSid
         where su.userName = #{param1}
           and su.isDelete = 0
-          and su.userType = 1 and si.personTypeKey != '01'
+          and su.userType = 1
+          and si.personTypeKey != '01'
     </select>
     <select id="selectByUserNameApp" resultType="com.yxt.anrui.portal.api.sysuser.SysUser">
         SELECT su.*
         FROM sys_user su
-        left join sys_staffinfo si on si.sid = su.staffSid
+                 left join sys_staffinfo si on si.sid = su.staffSid
         where su.userName = #{param1}
           and su.isDelete = 0
           and su.userType = 1
@@ -244,10 +245,11 @@
     <select id="selectByMobile" resultType="com.yxt.anrui.portal.api.sysuser.SysUser">
         select su.*
         from sys_user su
-        left join sys_staffinfo si on si.sid = su.staffSid
+                 left join sys_staffinfo si on si.sid = su.staffSid
         where su.mobile = #{mobile}
           and su.isDelete = 0
-          and su.userType = 1 and si.personTypeKey != '01'
+          and su.userType = 1
+          and si.personTypeKey != '01'
     </select>
 
     <update id="updateIsEnable">
@@ -267,7 +269,7 @@
     </select>
 
     <select id="getUserByRole" resultType="com.yxt.anrui.portal.api.sysuser.SysUserVo">
-       select distinct si.name, su.sid, su.staffSid<!--, so.orgSidPath-->
+        select distinct si.name, su.sid, su.staffSid<!--, so.orgSidPath-->
         from sys_user_role sr
                  left join sys_user su on sr.userSid = su.sid
                  left join sys_staffinfo si on si.sid = su.staffSid
@@ -310,9 +312,10 @@
     <select id="getUserByRoleSid" resultType="com.yxt.anrui.portal.api.sysuser.SysUserVo">
         select si.name, su.sid, su.staffSid
         from sys_user_role sr
-        left join sys_user su on sr.userSid = su.sid
-        left join sys_staffinfo si on si.sid = su.staffSid
-        where sr.roleSid = #{roleSid} and si.personTypeKey != '01'
+                 left join sys_user su on sr.userSid = su.sid
+                 left join sys_staffinfo si on si.sid = su.staffSid
+        where sr.roleSid = #{roleSid}
+          and si.personTypeKey != '01'
     </select>
 
     <update id="updateAppIdByMobile">
@@ -333,4 +336,18 @@
             #{item}
         </foreach>
     </select>
+
+    <select id="getUserMessageByRole" resultType="com.yxt.anrui.portal.api.sysuser.SysUserVo">
+        select distinct si.name, su.sid, su.staffSid,so.orgSidPath
+        from sys_user_role sr
+                 left join sys_user su on sr.userSid = su.sid
+                 left join sys_staffinfo si on si.sid = su.staffSid
+                 left join sys_staff_org so on so.staffSid = si.sid
+        where sr.roleSid = #{roleSid}
+          and find_in_set(#{levelOrgSid}, replace(so.orgSidPath, '/', ','))
+          and si.personTypeKey != '01' AND so.`manageType`=3 and su.sid in
+        <foreach collection="list" item="item" index="index" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+    </select>
 </mapper>
\ No newline at end of file
diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserService.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserService.java
index a48f86d0de..f8bdbd7f59 100644
--- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserService.java
+++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserService.java
@@ -995,6 +995,14 @@ public class SysUserService extends MybatisBaseService<SysUserMapper, SysUser> {
             if (query.getOrgSidPath().split("/").length >= Integer.parseInt(levelTypeKey) - 1) {
                 String levelOrgSid = query.getOrgSidPath().split("/")[Integer.parseInt(levelTypeKey) - 1];
                 sysUserVoList = baseMapper.getUserByRole(query.getRoleSid(), levelOrgSid);
+                if(sysUserVoList.size()>1){
+                    List<String> stringList = sysUserVoList.stream().map(v->v.getSid()).collect(Collectors.toList());
+                    List<SysUserVo> sysUserVoList1 = baseMapper.getUserMessageByRole(query.getRoleSid(), levelOrgSid,stringList);
+                    sysUserVoList1.removeAll(Collections.singleton(null));
+                    if(sysUserVoList1.size()>0){
+                        sysUserVoList = sysUserVoList1;
+                    }
+                }
             }
             sysUserVoList.removeAll(Collections.singleton(null));
             sysUserVoList.forEach(t -> {