1

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

@@ -148,24 +148,24 @@ public class SceneDeptShareServiceImpl extends ServiceImpl<ISceneDeptShareMapper
         List<SceneDeptShare> list = this.list(wrapper);
 
         //获取案件共享中场景
-        List<SceneDeptShare> caseIds = this.getCaseIdsListByDeptId(deptId);
-        for (SceneDeptShare sceneDeptShare : caseIds) {
-            List<CaseNumEntity> byCaseId = caseNumService.getByCaseId(sceneDeptShare.getCaseId());
-            for (CaseNumEntity caseNumEntity : byCaseId) {
-                if(isObj == 0 && NumTypeUtils.isLaser(caseNumEntity.getNumType())){
-                    SceneDeptShare sceneDeptShare2 = new SceneDeptShare();
-                    sceneDeptShare2.setNum(caseNumEntity.getNum());
-                    sceneDeptShare2.setIsAuth(sceneDeptShare.getIsAuth());
-                    list.add(sceneDeptShare2);
-                }
-                if(isObj == 1 && !NumTypeUtils.isLaser(caseNumEntity.getNumType()) && caseNumEntity.getNumType() != 3){
-                    SceneDeptShare sceneDeptShare2 = new SceneDeptShare();
-                    sceneDeptShare2.setNum(caseNumEntity.getNum());
-                    sceneDeptShare2.setIsAuth(sceneDeptShare.getIsAuth());
-                    list.add(sceneDeptShare2);
-                }
-            }
-        }
+//        List<SceneDeptShare> caseIds = this.getCaseIdsListByDeptId(deptId);
+//        for (SceneDeptShare sceneDeptShare : caseIds) {
+//            List<CaseNumEntity> byCaseId = caseNumService.getByCaseId(sceneDeptShare.getCaseId());
+//            for (CaseNumEntity caseNumEntity : byCaseId) {
+//                if(isObj == 0 && NumTypeUtils.isLaser(caseNumEntity.getNumType())){
+//                    SceneDeptShare sceneDeptShare2 = new SceneDeptShare();
+//                    sceneDeptShare2.setNum(caseNumEntity.getNum());
+//                    sceneDeptShare2.setIsAuth(sceneDeptShare.getIsAuth());
+//                    list.add(sceneDeptShare2);
+//                }
+//                if(isObj == 1 && !NumTypeUtils.isLaser(caseNumEntity.getNumType()) && caseNumEntity.getNumType() != 3){
+//                    SceneDeptShare sceneDeptShare2 = new SceneDeptShare();
+//                    sceneDeptShare2.setNum(caseNumEntity.getNum());
+//                    sceneDeptShare2.setIsAuth(sceneDeptShare.getIsAuth());
+//                    list.add(sceneDeptShare2);
+//                }
+//            }
+//        }
 
         return list;
     }
@@ -179,16 +179,16 @@ public class SceneDeptShareServiceImpl extends ServiceImpl<ISceneDeptShareMapper
         List<SceneDeptShare> list = this.list(wrapper);
 
         //获取案件共享中场景
-        List<SceneDeptShare> caseIds = this.getCaseIdsListByDeptId(deptId);
-        for (SceneDeptShare sceneDeptShare : caseIds) {
-            List<CaseFusionRelation> byCaseId = fusionRelationService.getByCaseId(sceneDeptShare.getCaseId());
-            for (CaseFusionRelation caseNumEntity : byCaseId) {
-                SceneDeptShare sceneDeptShare2 = new SceneDeptShare();
-                sceneDeptShare2.setFusionId(caseNumEntity.getFusionId());
-                sceneDeptShare2.setIsAuth(sceneDeptShare.getIsAuth());
-                list.add(sceneDeptShare2);
-            }
-        }
+//        List<SceneDeptShare> caseIds = this.getCaseIdsListByDeptId(deptId);
+//        for (SceneDeptShare sceneDeptShare : caseIds) {
+//            List<CaseFusionRelation> byCaseId = fusionRelationService.getByCaseId(sceneDeptShare.getCaseId());
+//            for (CaseFusionRelation caseNumEntity : byCaseId) {
+//                SceneDeptShare sceneDeptShare2 = new SceneDeptShare();
+//                sceneDeptShare2.setFusionId(caseNumEntity.getFusionId());
+//                sceneDeptShare2.setIsAuth(sceneDeptShare.getIsAuth());
+//                list.add(sceneDeptShare2);
+//            }
+//        }
 
         return list;
     }

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

@@ -84,6 +84,9 @@ public class SceneService implements ISceneService {
            param.setNumList(numList.stream().map(SceneDeptShare::getNum).collect(Collectors.toList()));
         }
         if(param.getSearchType() == 2){  //当前组织及下级组织的数据
+            if(StringUtils.isNotBlank(param.getDeptId())){
+                deptId = param.getDeptId();
+            }
             List<TmDepartment> sonByDeptId = tmDepartmentService.getSonByDeptId(deptId);
             List<String> deptIds = new ArrayList<>();
             deptIds.add(deptId);