459242451@qq.com 3 anni fa
parent
commit
659870a0e7

+ 3 - 4
ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -81,7 +81,7 @@
                  left join sys_user_role ur on u.user_id = ur.user_id
                  left join sys_role r on r.role_id = ur.role_id
     </sql>
-    <!-- OR u.dept_id IN ( SELECT t.dept_id FROM sys_dept t WHERE find_in_set(#{user.deptId},ancestors) ) -->
+    <!--  -->
     <select id="selectPageUserList" parameterType="SysUser" resultMap="SysUserResult">
         select u.user_id, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.password, u.sex,
         u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, d.dept_name, d.leader from
@@ -110,7 +110,7 @@
             AND date_format(u.create_time,'%y%m%d') &lt;= date_format(#{user.params.endTime},'%y%m%d')
         </if>
         <if test="user.deptId != null and user.deptId != 0">
-            AND (u.dept_id = #{user.deptId} )
+            AND (u.dept_id = #{user.deptId} ) OR u.dept_id IN ( SELECT t.dept_id FROM sys_dept t WHERE #{user.deptId} = ANY(string_to_array(ancestors,',') )
         </if>
         <!-- 数据范围过滤 -->
         <if test="user.params.dataScope != null and user.params.dataScope != ''">
@@ -146,8 +146,7 @@
             AND date_format(u.create_time,'%y%m%d') &lt;= date_format(#{params.endTime},'%y%m%d')
         </if>
         <if test="deptId != null and deptId != 0">
-            AND (u.dept_id = #{deptId} OR u.dept_id IN ( SELECT t.dept_id FROM sys_dept t WHERE find_in_set(#{deptId},
-            ancestors) ))
+            AND (u.dept_id = #{user.deptId} ) OR u.dept_id IN ( SELECT t.dept_id FROM sys_dept t WHERE #{user.deptId} = ANY(string_to_array(ancestors,',') )
         </if>
         <!-- 数据范围过滤 -->
         <if test="params.dataScope != null and params.dataScope != ''">