1

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

@@ -29,4 +29,5 @@ public class CaseParam extends RequestBase {
     private List<Integer> typeList;
 
     private List<Integer> fusionIds = new ArrayList<>();
+    private List<Integer> caseIds = new ArrayList<>();
 }

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

@@ -22,4 +22,6 @@ public interface ISceneDeptShareService extends IService<SceneDeptShare> {
     List<Integer> getFusionIdsListByDeptId(String deptId);
 
     List<SceneDeptShare>  shareAuthList(SceneDeptShare param);
+
+    List<Integer> getCaseIdsListByDeptId(String deptId);
 }

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

@@ -86,8 +86,8 @@ public class CaseServiceImpl extends ServiceImpl<ICaseMapper, CaseEntity> implem
                 deptIds.add(deptId);
             }
             if(param.getSearchType() == 1){  //下级共享给上级场景
-                List<Integer> fusionIds =  sceneDeptShareService.getFusionIdsListByDeptId(deptId);
-                param.setFusionIds(fusionIds);
+                List<Integer> caseIds =  sceneDeptShareService.getCaseIdsListByDeptId(deptId);
+                param.setCaseIds(caseIds);
             }
             if(param.getSearchType() == 2){  //当前组织及下级组织的数据
                 List<TmDepartment> sonByDeptId = tmDepartmentService.getSonByDeptId(deptId);
@@ -102,6 +102,9 @@ public class CaseServiceImpl extends ServiceImpl<ICaseMapper, CaseEntity> implem
         if(!deptIds.isEmpty()){
             wrapper.in(CaseEntity::getDeptId,deptIds);
         }
+        if(param.getCaseIds().isEmpty()){
+            wrapper.in(CaseEntity::getCaseId,param.getCaseIds());
+        }
         wrapper.eq(CaseEntity::getType,0);
         wrapper.orderByDesc(CaseEntity::getCreateTime);
         Page<CaseEntity> page = this.page( new Page<>(param.getPageNum(), param.getPageSize()), wrapper);

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

@@ -87,10 +87,20 @@ public class SceneDeptShareServiceImpl extends ServiceImpl<ISceneDeptShareMapper
         LambdaQueryWrapper<SceneDeptShare> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(SceneDeptShare::getDeptId,deptId);
         wrapper.ne(SceneDeptShare::getIsAuth,0);
+        wrapper.isNotNull(SceneDeptShare::getFusionId);
         List<SceneDeptShare> list = this.list(wrapper);
-        return list.stream().map(SceneDeptShare::getCaseId).collect(Collectors.toList());
+        return list.stream().map(SceneDeptShare::getFusionId).collect(Collectors.toList());
     }
 
+    @Override
+    public List<Integer> getCaseIdsListByDeptId(String deptId) {
+        LambdaQueryWrapper<SceneDeptShare> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(SceneDeptShare::getDeptId,deptId);
+        wrapper.ne(SceneDeptShare::getIsAuth,0);
+        wrapper.isNotNull(SceneDeptShare::getCaseId);
+        List<SceneDeptShare> list = this.list(wrapper);
+        return list.stream().map(SceneDeptShare::getCaseId).collect(Collectors.toList());
+    }
 
     @Override
     public  List<SceneDeptShare>  shareAuthList(SceneDeptShare param) {