任务返回增加人员列表

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/controller/TaskController.java

@@ -876,6 +876,17 @@ public class TaskController {
             }
         });
         t.setExecutorList(executorList);
+        //设置人员选择下拉列表
+        List<User> userList = null;
+        if (executorList.size() > 0) {
+            List<String> exeIds = executorList.stream().map(TaskExecutor::getExecutorId).collect(Collectors.toList());
+            //查询包含执行人（即使被停用）和在职的员工
+            userList = userMapper.selectList(new QueryWrapper<User>().select("id, name, phone, job_number, department_id").eq("company_id", user.getCompanyId()).and(w->w.eq("is_active", 1).or().in("id", exeIds)));
+        } else {
+            //仅仅需要在职员工
+            userList = userMapper.selectList(new QueryWrapper<User>().select("id, name, phone, job_number, department_id").eq("company_id", user.getCompanyId()).eq("is_active", 1));
+        }
+        t.setUserList(userList);
         //查询项目负责人id以及所属任务分组负责人id
         Project project = projectService.getOne(new QueryWrapper<Project>().eq("id", t.getProjectId()));
         TaskGroup group = taskGroupService.getOne(new QueryWrapper<TaskGroup>().eq("id", t.getGroupId()));

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/entity/Task.java

@@ -291,6 +291,11 @@ public class Task extends Model<Task> {
 
     @TableField(exist = false)
     private String finalChargeStatusText;
+
+    //执行人下拉列表
+    @TableField(exist = false)
+    private List<User> userList;
+
     @Override
     protected Serializable pkVal() {
         return this.id;

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/UserServiceImpl.java

@@ -2437,7 +2437,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
                 return msg;
             }
         }else {
-            QueryWrapper<User> wrapper = new QueryWrapper<User>().select("id, name, phone, job_number, department_id, is_active").eq("company_id", user.getCompanyId());
+            QueryWrapper<User> wrapper = new QueryWrapper<User>().select("id, name, phone, job_number, department_id").eq("company_id", user.getCompanyId()).eq("is_active", 1);
             if (departmentId != null) {
                 //获取全部子部门
                 List<Department> allDeptList = departmentMapper.selectList(new QueryWrapper<Department>().eq("company_id", user.getCompanyId()));