1

src/main/java/com/fdkankan/fusion/service/impl/TmProjectServiceImpl.java

@@ -82,15 +82,11 @@ public class TmProjectServiceImpl extends ServiceImpl<ITmProjectMapper, TmProjec
                return PageInfo.PageInfo(new Page<>(tmProject.getPageNum(),tmProject.getPageSize()));
            }
             List<String> collect = list.stream().map(TmDepartment::getId).collect(Collectors.toList());
-            HashSet<String> allDeptIds = new HashSet<>(collect);
-            for (String deptId : collect) {
-                List<TmDepartment> sonByDeptId = tmDepartmentService.getSonByDeptId(deptId);
-                allDeptIds.addAll( sonByDeptId.stream().map(TmDepartment::getId).collect(Collectors.toList()));
-            }
-            deptIds = deptIds.stream().filter(allDeptIds::contains).collect(Collectors.toList());
+            deptIds = deptIds.stream().filter(collect::contains).collect(Collectors.toList());
         }
+        List<String> deptIds2 = tmDepartmentService.getSonByDeptIdAndDeptIds(deptIds, tmProject.getDeptId());
+        wrapper.in(TmProject::getDeptId,deptIds2);
 
-        wrapper.in(TmProject::getDeptId,deptIds);
         //起火项目对象
         if(StringUtils.isNotBlank(tmProject.getProjectSn())){
             wrapper.like(TmProject::getProjectSn , tmProject.getProjectSn());
@@ -115,9 +111,6 @@ public class TmProjectServiceImpl extends ServiceImpl<ITmProjectMapper, TmProjec
             wrapper.like(TmProject::getOrganizerUsers , tmProject.getOrganizerUsers());
         }
 
-        if(StringUtils.isNotBlank(tmProject.getDeptId())){
-            wrapper.eq(TmProject::getDeptId , tmProject.getDeptId());
-        }
         //事故日期
         if(StringUtils.isNotBlank(tmProject.getAccidentDate())){
             wrapper.ge(TmProject::getAccidentDate,tmProject.getAccidentDateStart());