APP人员列表看不到自己

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

@@ -78,8 +78,11 @@ public class SysUserController extends BaseController
         if(user.getDeptId()==null || user.getDeptId()==0l){
             user.setDeptId(users.getDeptId());
         }
+        if(user.getUserId()==null || user.getUserId()==0l){
+            user.setUserId(users.getUserId());
+        }
         user.setApplyFor("1");
-        List<SysUser> list = userService.selectUserList(user);
+        List<SysUser> list = userService.selectUserListNoZj(user);
         return getDataTable(list);
     }
 

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

@@ -155,4 +155,6 @@ public interface SysUserMapper
     int updatePhone(SysUser user);
 
     List<SysUser> selectUserListNoDept();
+
+    List<SysUser> selectUserListNoZj(SysUser user);
 }

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

@@ -253,4 +253,6 @@ public interface ISysUserService
     AjaxResult allocationOne(String phonenumber);
 
     int reset(Long id);
+
+    List<SysUser> selectUserListNoZj(SysUser user);
 }

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

@@ -720,4 +720,9 @@ public class SysUserServiceImpl implements ISysUserService
         applyForUser.setApplyFor("0");
         return userMapper.updateUser(applyForUser);
     }
+
+    @Override
+    public List<SysUser> selectUserListNoZj(SysUser user) {
+        return userMapper.selectUserListNoZj(user);
+    }
 }

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

@@ -283,4 +283,40 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		select ifnull(count(1),0) from sys_user where del_flag = '0' and status = '0' and find_in_set(dept_id, #{ancestors})
 	</select>
 
+
+	<select id="selectUserListNoZj" 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 not in (#{userId})
+		</if>
+		<if test="userName != null and userName != ''">
+			AND u.user_name like concat('%', #{userName}, '%')
+		</if>
+		<if test="nickName != null and nickName != ''">
+			AND u.nick_name like concat('%', #{nickName}, '%')
+		</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>
+		<if test="parameter != null and parameter != ''">
+			AND (u.phonenumber like concat('%', #{parameter}, '%') or u.nick_name like concat('%', #{parameter}, '%'))
+		</if>
+		<!-- 数据范围过滤 -->
+		${params.dataScope}
+	</select>
+
 </mapper>