bugfix - 普通用户角色问卷列表负责人、审核人未带出问题

rc-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java

@@ -59,7 +59,8 @@ public class SysUserController extends BaseController
     @GetMapping("/listAll")
     public AjaxResult listAll(SysUser user)
     {
-        return success(userService.selectUserList(user));
+        user.setDeptId(getLoginUser().getDeptId());
+        return success(userService.selectAllUserList(user));
     }
 
     /**

rc-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java

@@ -19,6 +19,8 @@ public interface SysUserMapper
      */
     public List<SysUser> selectUserList(SysUser sysUser);
 
+    public List<SysUser> selectAllUserList(SysUser user);
+
     /**
      * 根据条件分页查询已配用户角色列表
      * 

rc-system/src/main/java/com/ruoyi/system/service/ISysUserService.java

@@ -18,6 +18,8 @@ public interface ISysUserService
      */
     public List<SysUser> selectUserList(SysUser user);
 
+    public List<SysUser> selectAllUserList(SysUser user);
+
     /**
      * 根据条件分页查询已分配用户角色列表
      * 

rc-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java

@@ -78,6 +78,12 @@ public class SysUserServiceImpl implements ISysUserService
         return userMapper.selectUserList(user);
     }
 
+    @Override
+    public List<SysUser> selectAllUserList(SysUser user)
+    {
+        return userMapper.selectAllUserList(user);
+    }
+
     /**
      * 根据条件分页查询已分配用户角色列表
      * 

rc-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -84,6 +84,33 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<!-- 数据范围过滤 -->
 		${params.dataScope}
 	</select>
+
+	<select id="selectAllUserList" parameterType="SysUser" resultMap="SysUserResult">
+		select u.user_id, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, 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 sys_user u
+		left join sys_dept d on u.dept_id = d.dept_id
+		where u.del_flag = '0'
+		<if test="userId != null and userId != 0">
+			AND u.user_id = #{userId}
+		</if>
+		<if test="userName != null and userName != ''">
+			AND u.user_name like concat('%', #{userName}, '%')
+		</if>
+		<if test="status != null and status != ''">
+			AND u.status = #{status}
+		</if>
+		<if test="phonenumber != null and phonenumber != ''">
+			AND u.phonenumber like concat('%', #{phonenumber}, '%')
+		</if>
+		<if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
+			AND date_format(u.create_time,'%Y%m%d') &gt;= date_format(#{params.beginTime},'%Y%m%d')
+		</if>
+		<if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
+			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) ))
+		</if>
+	</select>
 	
 	<select id="selectAllocatedList" parameterType="SysUser" resultMap="SysUserResult">
 	    select distinct u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.phonenumber, u.status, u.create_time