ws

src/main/java/com/fdkankan/fusion/service/ITmDepartmentService.java

@@ -40,4 +40,5 @@ public interface ITmDepartmentService extends IService<TmDepartment> {
     List<TmDepartment> getLikeName(String organizerDeptName);
 
     List<String> getSonByDeptIdAndDeptIds(List<String> deptIds, String deptId);
+    List<String> getSonByDeptIdAndDeptIds(List<String> deptIds, String deptId,Integer type);
 }

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

@@ -132,18 +132,7 @@ public class ModelServiceImpl extends ServiceImpl<IModelMapper, Model> implement
             String deptId =  caseService.getDeptId(param.getCaseId());
             wrapper.eq(Model::getDeptId,deptId);
         }
-        List<String> deptIds2 = new ArrayList<>();
-        if(StringUtils.isNotBlank(param.getDeptId())) {
-            if (param.getSearchType() == 0) {
-                List<TmDepartment> sonByDeptId = tmDepartmentService.getSonByDeptId(param.getDeptId());
-                deptIds2 = sonByDeptId.stream().map(TmDepartment::getId).collect(Collectors.toList());
-            }
-            deptIds2.add(param.getDeptId());
-        }
-        deptIds2 = deptIds.stream().filter(deptIds2::contains).collect(Collectors.toList());
-        if(deptIds2.isEmpty()){
-            return PageInfo.PageInfoEmpty();
-        }
+        List<String> deptIds2 = tmDepartmentService.getSonByDeptIdAndDeptIds(deptIds, param.getDeptId(),param.getSearchType());
         wrapper.in(Model::getDeptId,deptIds2);
         wrapper.eq(Model::getType,3);
         wrapper.notIn(Model::getCreateStatus,-2);

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

@@ -290,4 +290,26 @@ public class TmDepartmentServiceImpl extends ServiceImpl<ITmDepartmentMapper, Tm
         }
         return deptIds;
     }
+
+    @Override
+    public List<String> getSonByDeptIdAndDeptIds(List<String> deptIds, String deptId,Integer type) {
+        if(type == 0){
+            return getSonByDeptIdAndDeptIds(deptIds,deptId);
+        }
+        List<String> deptIds2 = new ArrayList<>();
+        if(StringUtils.isNotBlank(deptId)){
+            deptIds2.add(deptId);
+        }
+        if(!deptIds2.isEmpty()){
+            List<String> collect = deptIds.stream().filter(deptIds2::contains).collect(Collectors.toList());
+            if(collect.size()<=0){
+                collect.add("empty-dept");
+            }
+            return collect;
+        }
+        if(deptIds.size()<=0){
+            deptIds.add("empty-dept");
+        }
+        return deptIds;
+    }
 }