1. 修复案件列表查询接口

src/main/java/com/supervision/police/service/impl/ModelCaseServiceImpl.java

@@ -71,8 +71,9 @@ public class ModelCaseServiceImpl extends ServiceImpl<ModelCaseMapper, ModelCase
 
         List<CasePerson> casePersonList = casePersonMapper.selectList(
                 Wrappers.lambdaQuery(CasePerson.class).in(CasePerson::getCaseId, caseIdList));
-        Map<String, List<CasePerson>> persionMap = casePersonList.stream().collect(
-                Collectors.groupingBy(person-> StrUtil.equals(person.getRoleCode(), "1") ? "1" :"2"));
+        // 多级分组
+        Map<String, Map<String, List<CasePerson>>> persionMap = casePersonList.stream().collect(Collectors.groupingBy(CasePerson::getCaseId,
+                Collectors.groupingBy(person -> StrUtil.equals(person.getRoleCode(), "1") ? "1" : "2")));
         List<ComDictionary> dicts = comDictionaryService.list();
 
         return modelCaseIPage.convert(modelCaseInfo -> {
@@ -86,10 +87,12 @@ public class ModelCaseServiceImpl extends ServiceImpl<ModelCaseMapper, ModelCase
             modelCaseDTO.setCaseStatusName(comDictionaryService.getName(dicts, "case_status", modelCaseDTO.getCaseStatus()));
             modelCaseDTO.setCrimeModeName(comDictionaryService.getName(dicts, "crime_mode", modelCaseDTO.getCrimeMode()));
             modelCaseDTO.setIdentifyResultName(comDictionaryService.getName(dicts, "identify_result", modelCaseDTO.getIdentifyResult()));
-
-            modelCaseDTO.setLawActor(CollUtil.getFirst(persionMap.get("1")));
+            Map<String, List<CasePerson>> casePersonMap = persionMap.get(modelCaseDTO.getId());
+            if (CollUtil.isNotEmpty(casePersonMap)){
+                modelCaseDTO.setLawActor(CollUtil.getFirst(casePersonMap.get("1")));
                 modelCaseDTO.floatLawActorInfo();
-            modelCaseDTO.setLawPartyList(persionMap.get("2"));
+                modelCaseDTO.setLawPartyList(casePersonMap.get("2"));
+            }
             return modelCaseDTO;
         });
     }