1

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

@@ -82,8 +82,10 @@ public class SceneService implements ISceneService {
         }
         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);
             List<String> sonDeptIds = sonByDeptId.stream().map(TmDepartment::getId).collect(Collectors.toList());