用户树修改

oa-back/ruoyi-system/src/main/java/com/ruoyi/system/domain/TreeSelectNew.java

@@ -44,7 +44,7 @@ public class TreeSelectNew implements Serializable
         SysUser sysUser = new SysUser();
         sysUser.setDeptId(dept.getDeptId());
         SysUserMapper userMapper = SpringUtils.getBean(SysUserMapper.class);
-        List<SysUser> list = userMapper.selectUserList(sysUser);
+        List<SysUser> list = userMapper.selectUserServingList(sysUser);
         if (dept.getDeptId() == 103) {
             SysUserPostMapper userPostMapper = SpringUtils.getBean(SysUserPostMapper.class);
             list = userPostMapper.selectGmAssistant(new SysUser());

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

@@ -19,6 +19,14 @@ public interface SysUserMapper
      */
     public List<SysUser> selectUserList(SysUser sysUser);
 
+    /**
+     * 根据条件分页查询在职用户列表
+     *
+     * @param sysUser 用户信息
+     * @return 用户信息集合信息
+     */
+    public List<SysUser> selectUserServingList(SysUser sysUser);
+
     /**
      * 根据条件分页查询已配用户角色列表
      * 

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

@@ -18,6 +18,14 @@ public interface ISysUserService
      */
     public List<SysUser> selectUserList(SysUser user);
 
+    /**
+     * 根据条件分页查询在职用户列表
+     *
+     * @param user 用户信息
+     * @return 用户信息集合信息
+     */
+    public List<SysUser> selectUserServingList(SysUser user);
+
     /**
      * 根据条件分页查询已分配用户角色列表
      * 

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

@@ -74,6 +74,19 @@ public class SysUserServiceImpl implements ISysUserService
         return userMapper.selectUserList(user);
     }
 
+    /**
+     * 根据条件分页查询在职用户列表
+     *
+     * @param user 用户信息
+     * @return 用户信息集合信息
+     */
+    @Override
+    @DataScope(deptAlias = "d", userAlias = "u")
+    public List<SysUser> selectUserServingList(SysUser user)
+    {
+        return userMapper.selectUserServingList(user);
+    }
+
     /**
      * 根据条件分页查询已分配用户角色列表
      * 

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

@@ -140,7 +140,54 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		${params.dataScope}
 		order by u.dept_id, u.user_id
 	</select>
-	
+
+    <select id="selectUserServingList" parameterType="SysUser" resultMap="SysUserResult">
+		select u.user_id, u.dept_id, u.nick_name, u.pinyin, 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, u.pm_level, u.titles, u.certificates, u.update_reason,
+		       u.engineer_level, u.post_level, u.salary_level, u.operator_level, u.entry_date, u.birthday, u.age, u.id_card,
+		       u.native_place, u.political_affiliation, u.ethnic, u.graduate_school, u.major, u.degree, u.contract_sign, u.contract_expire,
+		       u.home_place, d.dept_name, d.leader, ps.salary from sys_user u
+		left join sys_dept d on u.dept_id = d.dept_id
+		left join cmc_post_salary ps on u.post_level = ps.post_level and u.salary_level = ps.salary_level
+		where u.del_flag = '0' and u.user_id != 1 AND (u.status = '0' or u.status = '3' or u.status = '4')
+		<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="nickName != null and nickName != ''">
+			AND u.nick_name like concat('%', #{nickName}, '%')
+		</if>
+		<if test="phonenumber != null and phonenumber != ''">
+			AND u.phonenumber like concat('%', #{phonenumber}, '%')
+		</if>
+		<if test="degree != null and degree != ''">
+			AND u.degree = #{degree}
+		</if>
+		<if test="titles != null and titles != ''">
+			AND find_in_set(#{titles}, u.titles)
+		</if>
+		<if test="certificates != null and certificates != ''">
+			AND find_in_set(#{certificates}, u.certificates)
+		</if>
+		<if test="politicalAffiliation != null and politicalAffiliation != ''">
+			AND find_in_set(#{politicalAffiliation}, u.political_affiliation)
+		</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>
+		<!-- 数据范围过滤 -->
+		${params.dataScope}
+		order by u.dept_id, u.user_id
+	</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
 	    from sys_user u