ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/WorkbenchesController.java
@@ -115,12 +115,21 @@ if (deptType == 1) { // 查询片区 TProjectDept projectDept = projectDeptService.getById(deptId); // 查询项目部 TProjectDept parent = projectDeptService.getById(projectDept.getParentId()); List<TProjectDept> children = new ArrayList<>(); children.add(projectDept); parent.setChildren(children); projectDeptList.add(parent); if("0".equals(projectDept.getParentId())){ // 查询项目部 List<TProjectDept> childProjectDept = projectDeptService.list(Wrappers.lambdaQuery(TProjectDept.class) .eq(TProjectDept::getStatus,1) .eq(TProjectDept::getParentId,projectDept.getId())); projectDept.setChildren(childProjectDept); projectDeptList.add(projectDept); }else { // 查询项目部 TProjectDept parent = projectDeptService.getById(projectDept.getParentId()); List<TProjectDept> children = new ArrayList<>(); children.add(projectDept); parent.setChildren(children); projectDeptList.add(parent); } }else { projectDeptList = projectDeptService.list(Wrappers.lambdaQuery(TProjectDept.class) .eq(TProjectDept::getStatus,1) ruoyi-admin/src/main/java/com/ruoyi/web/controller/task/TaskUtil.java
@@ -171,10 +171,10 @@ List<String> proIds = projectDepts.stream().map(TProjectDept::getId).collect(Collectors.toList()); // 拿到抽取的项目部下的所有保洁员 List<TProjectDept> tProjectDeptList = projectDeptService.list(Wrappers.lambdaQuery(TProjectDept.class) .in(TProjectDept::getId, proIds)); // List<TProjectDept> tProjectDeptList = projectDeptService.list(Wrappers.lambdaQuery(TProjectDept.class) // .in(TProjectDept::getId, proIds)); // 获取片区id List<String> areaIds = tProjectDeptList.stream().map(TProjectDept::getId).collect(Collectors.toList()); List<String> areaIds = projectDepts.stream().map(TProjectDept::getId).collect(Collectors.toList()); if(CollectionUtils.isEmpty(areaIds)){ return; } @@ -184,7 +184,7 @@ .in(TCleaner::getProjectId, areaIds)); int cleanerSums = num1 * Integer.parseInt(count + ""); // 获取每天需要抽取的保洁员数,向上取整 if (cleanerSums <cycle){ if (cleanerSums < cycle){ cleanerSums = cycle; } int dayCleanerCount = cleanerSums / cycle;
