From a0fce66cd2822720e7862e83c175f476cd7d61b7 Mon Sep 17 00:00:00 2001
From: xueqingkun <xueqingkun@126.com>
Date: Tue, 5 Nov 2024 16:33:02 +0800
Subject: [PATCH] =?UTF-8?q?1.=20=E4=BF=AE=E5=A4=8Dbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/supervision/police/dto/EvidenceCategoryDTO.java  | 4 +++-
 .../police/service/impl/CaseEvidenceServiceImpl.java          | 4 ++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/supervision/police/dto/EvidenceCategoryDTO.java b/src/main/java/com/supervision/police/dto/EvidenceCategoryDTO.java
index b396d6f..fe1ae39 100644
--- a/src/main/java/com/supervision/police/dto/EvidenceCategoryDTO.java
+++ b/src/main/java/com/supervision/police/dto/EvidenceCategoryDTO.java
@@ -76,7 +76,9 @@ public class EvidenceCategoryDTO {
             for (EvidenceCategoryDTO evidenceCategoryDTO : child) {
                 List<String> path = evidenceCategoryDTO.listCategoryIdPath(id);
                 if (CollUtil.isNotEmpty(path)){
-                    path.add(0,this.id);
+                    if (StrUtil.isNotEmpty(this.id)){
+                        path.add(0,this.id);
+                    }
                     return path;
                 }
             }
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 9d4ed6c..4b18751 100644
--- a/src/main/java/com/supervision/police/service/impl/CaseEvidenceServiceImpl.java
+++ b/src/main/java/com/supervision/police/service/impl/CaseEvidenceServiceImpl.java
@@ -5,6 +5,7 @@ import cn.hutool.core.date.DateTime;
 import cn.hutool.core.lang.Assert;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.json.JSONUtil;
+import com.baomidou.mybatisplus.core.incrementer.DefaultIdentifierGenerator;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.plugins.pagination.PageDTO;
@@ -941,6 +942,8 @@ public class CaseEvidenceServiceImpl extends ServiceImpl<CaseEvidenceMapper, Cas
             if (directory.getLevel() == 1 || directory.getLevel() == 2) {
                 for (String fileId : evidenceFile.getFileIdList()) {
                     CaseEvidenceDetailDTO caseEvidenceDetailDTO = new CaseEvidenceDetailDTO();
+                    // 预先生成证据id
+                    caseEvidenceDetailDTO.setId(DefaultIdentifierGenerator.getInstance().nextId(null).toString());
                     caseEvidenceDetailDTO.setEvidenceType(directory.getCategoryId());
                     caseEvidenceDetailDTO.setDirectoryId(directoryId);
                     EvidenceFileDTO evidenceFileDTO = new EvidenceFileDTO();
@@ -953,6 +956,7 @@ public class CaseEvidenceServiceImpl extends ServiceImpl<CaseEvidenceMapper, Cas
                         caseEvidenceDetailDTO.setEvidenceName(minioFile.getFilename().split("\\.")[0]);
                         evidenceFileDTO.setFileType(minioFile.getFileType());
                         evidenceFileDTO.setFileName(minioFile.getFilename());
+                        evidenceFileDTO.setEvidenceId(caseEvidenceDetailDTO.getId());
                     }
                     caseEvidenceDetailDTO.setFileList(List.of(evidenceFileDTO));
                     caseEvidenceDetailDTOS.add(caseEvidenceDetailDTO);