ws

src/main/java/com/fdkankan/fusion/request/ModelPram.java

@@ -12,4 +12,6 @@ public class ModelPram extends RequestBase {
     private Integer modelId;
     private Integer caseId;
     private String deptId;
+
+    private Integer searchType = 0;
 }

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

@@ -132,7 +132,18 @@ public class ModelServiceImpl extends ServiceImpl<IModelMapper, Model> implement
             String deptId =  caseService.getDeptId(param.getCaseId());
             wrapper.eq(Model::getDeptId,deptId);
         }
-        List<String> deptIds2 = tmDepartmentService.getSonByDeptIdAndDeptIds(deptIds, param.getDeptId());
+        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();
+        }
         wrapper.in(Model::getDeptId,deptIds2);
         wrapper.eq(Model::getType,3);
         wrapper.notIn(Model::getCreateStatus,-2);