环节获取用户暂修改测试

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

@@ -60,14 +60,45 @@
                     )
             </if>
             <if test="userName != null and userName != ''">
-                and concat(IFNULL(USER.userName
+                and
-                , '')
+                concat
-                , ifnull(USER.mobile
+                (
-                , '')
+                IFNULL
-                , ifnull(staff.name
+                (
-                , '')) LIKE concat('%'
+                USER
-                , #{userName}
+                .
-                , '%')
+                userName
+                ,
+                ''
+                )
+                ,
+                ifnull
+                (
+                USER
+                .
+                mobile
+                ,
+                ''
+                )
+                ,
+                ifnull
+                (
+                staff
+                .
+                name
+                ,
+                ''
+                )
+                )
+                LIKE
+                concat
+                (
+                '%'
+                ,
+                #{userName}
+                ,
+                '%'
+                )
             </if>
         </where>
     </select>
@@ -186,10 +217,11 @@
     <select id="selectUserInfoByUserSidOne" resultType="com.yxt.anrui.portal.api.sysuser.SysUserInfoVo">
         SELECT su.staffSid, si.name staffName, sso.orgSid, sso.orgName, so.orgCode
         FROM sys_user su
-        LEFT JOIN sys_staffinfo si ON su.staffSid = si.sid
+                 LEFT JOIN sys_staffinfo si ON su.staffSid = si.sid
-        LEFT JOIN sys_staff_org sso ON su.staffSid = sso.staffSid
+                 LEFT JOIN sys_staff_org sso ON su.staffSid = sso.staffSid
-        LEFT JOIN sys_organization so ON sso.orgSid = so.sid
+                 LEFT JOIN sys_organization so ON sso.orgSid = so.sid
-        WHERE su.sid = #{userSid} and find_in_set(#{orgSid}, replace(sso.orgSidPath, '/', ','))
+        WHERE su.sid = #{userSid}
+          and find_in_set(#{orgSid}, replace(sso.orgSidPath, '/', ','))
         ORDER BY sso.id
         LIMIT 1
     </select>
@@ -232,13 +264,21 @@
     </select>
 
     <select id="getUserByRole" resultType="com.yxt.anrui.portal.api.sysuser.SysUserVo">
-        select si.name, su.sid, su.staffSid,so.orgSidPath
+       <!-- 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 find_in_set(#{levelOrgSid}, replace(so.orgSidPath, '/', ',')) and si.personTypeKey != '01'
+          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'
     </select>
 
     <select id="getUserByOrgSid" resultType="java.util.Map">
@@ -274,8 +314,8 @@
     <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_user su on sr.userSid = su.sid
-                 left join sys_staffinfo si on si.sid = su.staffSid
+        left join sys_staffinfo si on si.sid = su.staffSid
         where sr.roleSid = #{roleSid} and si.personTypeKey != '01'
     </select>