员工分配

src/main/java/cn/ezhizao/project/system/controller/SysUserController.java

@@ -112,6 +112,18 @@ public class SysUserController extends BaseController {
         return getDataTable(distinct);
     }
 
+    /**
+     * 获取用户通过deptId
+     */
+    @PreAuthorize("@ss.hasPermi('system:user:list')")
+    @PostMapping("/getUsersItemByDeptId")
+    public TableDataInfo getUsersItemByDeptId(@RequestBody SysUser sysUser) {
+        startPage();
+        List<SysUser> list = userService.selectUserItemByDeptId(sysUser);
+        List<SysUser> distinct = list.stream().distinct().collect(Collectors.toList());
+        return getDataTable(distinct);
+    }
+
     /** 递归获取所有下级部门 */
     public static List<SysDept> getAllSubDepartments(SysDept department, List<SysDept> allDepartments) {
         List<SysDept> subDepartments = new ArrayList<>();

src/main/java/cn/ezhizao/project/system/domain/SysUser.java

@@ -1,5 +1,6 @@
 package cn.ezhizao.project.system.domain;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import cn.ezhizao.common.xss.Xss;
 import cn.ezhizao.framework.aspectj.lang.annotation.Excel;
@@ -134,12 +135,24 @@ public class SysUser extends BaseEntity {
     private Integer isFormman;
     private Integer isYardman;
     private Integer isEdit;
-
+    /**
+     * 部门ID
+     */
+    @TableField(exist = false)
+    private Long deptId;
     @Override
     public Long getTenantId() {
         return tenantId;
     }
 
+    public Long getDeptId() {
+        return deptId;
+    }
+
+    public void setDeptId(Long deptId) {
+        this.deptId = deptId;
+    }
+
     @Override
     public void setTenantId(Long tenantId) {
         this.tenantId = tenantId;

src/main/java/cn/ezhizao/project/system/mapper/SysUserMapper.java

@@ -158,4 +158,11 @@ public interface SysUserMapper {
      * 根据userName查询userId
      */
     public SysUser getUserByCode(String userName);
+
+    /**
+     * 根据工段id获取用户信息
+     * @param sysUser 用户信息
+     * @return 用户信息
+     */
+    public List<SysUser> selectUserItemByDeptId(SysUser sysUser);
 }

src/main/java/cn/ezhizao/project/system/service/ISysUserService.java

@@ -243,4 +243,11 @@ public interface ISysUserService
      * @return 用户信息
      */
     SysUser getUserByCode(String userName);
+
+    /**
+     * 根据工段id获取用户信息
+     * @param sysUser 用户信息
+     * @return 用户信息
+     */
+    List<SysUser> selectUserItemByDeptId(SysUser sysUser);
 }

src/main/java/cn/ezhizao/project/system/service/impl/SysUserServiceImpl.java

@@ -558,4 +558,9 @@ public class SysUserServiceImpl implements ISysUserService {
     public SysUser getUserByCode(String userName) {
         return userMapper.getUserByCode(userName);
     }
+
+    @Override
+    public List<SysUser> selectUserItemByDeptId(SysUser sysUser) {
+        return userMapper.selectUserItemByDeptId(sysUser);
+    }
 }

src/main/resources/mybatis/system/SysUserMapper.xml

@@ -81,6 +81,20 @@
 			u.del_flag = '0' AND
 			u.user_type = '02'
     </select>
+
+	<select id="selectUserItemByDeptId" parameterType="SysUser" resultMap="SysUserResult">
+		SELECT u.* FROM sys_user u right join sys_dept_user d on u.user_id = d.user_id
+		WHERE u.del_flag = '0' AND d.deleted ='0' AND u.user_type = '02'
+		<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="deptId != null and deptId != 0">
+			AND d.dept_id = #{deptId}
+		</if>
+	</select>
 	<select id="getUserByCode" parameterType="SysUser" resultMap="SysUserResult">
 		SELECT * FROM sys_user WHERE del_flag = 0 AND user_name = #{userName}
 	</select>