diff --git a/src/main/java/com/supervision/police/service/EvidenceCategoryService.java b/src/main/java/com/supervision/police/service/EvidenceCategoryService.java index 3d93de5..7c72235 100644 --- a/src/main/java/com/supervision/police/service/EvidenceCategoryService.java +++ b/src/main/java/com/supervision/police/service/EvidenceCategoryService.java @@ -15,4 +15,6 @@ public interface EvidenceCategoryService extends IService { List listCategoryTree(String caseType); + + List listCategoryByCaseType(String caseType); } diff --git a/src/main/java/com/supervision/police/service/impl/CaseEvidenceServiceImpl.java b/src/main/java/com/supervision/police/service/impl/CaseEvidenceServiceImpl.java index 9660490..881fd68 100644 --- a/src/main/java/com/supervision/police/service/impl/CaseEvidenceServiceImpl.java +++ b/src/main/java/com/supervision/police/service/impl/CaseEvidenceServiceImpl.java @@ -802,7 +802,7 @@ public class CaseEvidenceServiceImpl extends ServiceImpl CollUtil.isNotEmpty(evidenceDetail.getFileList())) .map(EvidenceProcessDTO::new).collect(Collectors.toList()); List evidenceDirectoryDTOS = evidenceDirectoryService.listDirectoryTree(caseId); - List categoryList = evidenceCategoryService.lambdaQuery().eq(EvidenceCategory::getCaseType, modelCase.getCaseType()).list(); + List categoryList = evidenceCategoryService.listCategoryByCaseType(modelCase.getCaseType()); for (EvidenceProcessDTO evidenceProcessDTO : processDTOList) { evidenceProcessDTO.setTemplateInfo(evidenceDirectoryDTOS, categoryList); evidenceProcessDTO.setEvidenceTypeName(categoryList); diff --git a/src/main/java/com/supervision/police/service/impl/EvidenceCategoryServiceImpl.java b/src/main/java/com/supervision/police/service/impl/EvidenceCategoryServiceImpl.java index 48af95b..fc5e242 100644 --- a/src/main/java/com/supervision/police/service/impl/EvidenceCategoryServiceImpl.java +++ b/src/main/java/com/supervision/police/service/impl/EvidenceCategoryServiceImpl.java @@ -51,6 +51,11 @@ public class EvidenceCategoryServiceImpl extends ServiceImpl StrUtil.isEmpty(categoryDTO.getParentId())).toList(); } + + @Override + public List listCategoryByCaseType(String caseType) { + return super.lambdaQuery().list(); + } } diff --git a/src/main/java/com/supervision/police/service/impl/ModelCaseServiceImpl.java b/src/main/java/com/supervision/police/service/impl/ModelCaseServiceImpl.java index 922ada8..2f3eabe 100644 --- a/src/main/java/com/supervision/police/service/impl/ModelCaseServiceImpl.java +++ b/src/main/java/com/supervision/police/service/impl/ModelCaseServiceImpl.java @@ -171,7 +171,7 @@ public class ModelCaseServiceImpl extends ServiceImpl