1

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

@@ -74,31 +74,34 @@ public class SceneService implements ISceneService {
         String deptId = tmDepartmentService.getDeptId();
         HashMap<String,SceneDeptShare> shareHashMap = new HashMap<>();
         List<String> deptIds = new ArrayList<>();
-        if(StringUtils.isNotBlank(param.getDeptId())){
-            deptIds.add(param.getDeptId());
-        }else {
-            if(param.getSearchType() == 0){  //当前组织下场景
-                deptIds.add(deptId);
-            }
-            if(param.getSearchType() == 1){  //下级共享给上级场景
-                List<SceneDeptShare> numList =  sceneDeptShareService.getNumListByDeptId(deptId,param.getIsObj());
-                if(numList == null || numList.isEmpty()){
-                    return PageInfo.PageInfoEmpty();
-                }
-                numList.forEach(e -> shareHashMap.put(e.getNum()+e.getIsObj(),e));
-                param.setNumList(numList.stream().map(SceneDeptShare::getNum).collect(Collectors.toList()));
-                List<TmDepartment> sonByDeptId = tmDepartmentService.getSonByDeptId(deptId);
-                deptIds = sonByDeptId.stream().map(TmDepartment::getId).collect(Collectors.toList());
-                if(deptIds.isEmpty()){
-                    return PageInfo.PageInfoEmpty();
-                }
+        if(param.getSearchType() == 0){  //当前组织下场景
+            deptIds.add(deptId);
+        }
+        if(param.getSearchType() == 1){  //下级共享给上级场景
+            List<SceneDeptShare> numList =  sceneDeptShareService.getNumListByDeptId(deptId,param.getIsObj());
+            if(numList == null || numList.isEmpty()){
+                return PageInfo.PageInfoEmpty();
             }
-            if(param.getSearchType() == 2){  //当前组织及下级组织的数据
-                List<TmDepartment> sonByDeptId = tmDepartmentService.getSonByDeptId(deptId);
-                deptIds.add(deptId);
-                deptIds.addAll(sonByDeptId.stream().map(TmDepartment::getId).collect(Collectors.toList()));
+            numList.forEach(e -> shareHashMap.put(e.getNum()+e.getIsObj(),e));
+            param.setNumList(numList.stream().map(SceneDeptShare::getNum).collect(Collectors.toList()));
+            List<TmDepartment> sonByDeptId = tmDepartmentService.getSonByDeptId(deptId);
+            deptIds = sonByDeptId.stream().map(TmDepartment::getId).collect(Collectors.toList());
+            if(deptIds.isEmpty()){
+                return PageInfo.PageInfoEmpty();
             }
         }
+        if(param.getSearchType() == 2){  //当前组织及下级组织的数据
+            List<TmDepartment> sonByDeptId = tmDepartmentService.getSonByDeptId(deptId);
+            deptIds.add(deptId);
+            deptIds.addAll(sonByDeptId.stream().map(TmDepartment::getId).collect(Collectors.toList()));
+        }
+        if(StringUtils.isNotBlank(param.getDeptId())){
+           if(!deptIds.contains(param.getDeptId())){
+               return PageInfo.PageInfoEmpty();
+           }else {
+               deptIds = Arrays.asList(param.getDeptId());
+           }
+        }
         if(deptIds.isEmpty()){
             return PageInfo.PageInfoEmpty();
         }