获取环节用户调整

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserMapper.xml

@@ -264,21 +264,14 @@
     </select>
 
     <select id="getUserByRole" resultType="com.yxt.anrui.portal.api.sysuser.SysUserVo">
-       <!-- select 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
                  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'-->
-        select 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 so.orgSidPath like concat('%', #{levelOrgSid})
-        and si.personTypeKey != '01'
+          and si.personTypeKey != '01'
     </select>
 
     <select id="getUserByOrgSid" resultType="java.util.Map">

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserService.java

@@ -995,7 +995,9 @@ public class SysUserService extends MybatisBaseService<SysUserMapper, SysUser> {
                 sysUserVoList = baseMapper.getUserByRole(query.getRoleSid(), levelOrgSid);
             }
             sysUserVoList.removeAll(Collections.singleton(null));
-
+            sysUserVoList.forEach(t -> {
+                t.setOrgSidPath(query.getOrgSidPath());
+            });
         } else {
             return rb.setMsg("该角色层级未设置");
         }