1. 修复bug

topo_dev
xueqingkun 7 months ago
parent 7eb0459433
commit a0fce66cd2

@ -76,7 +76,9 @@ public class EvidenceCategoryDTO {
for (EvidenceCategoryDTO evidenceCategoryDTO : child) { for (EvidenceCategoryDTO evidenceCategoryDTO : child) {
List<String> path = evidenceCategoryDTO.listCategoryIdPath(id); List<String> path = evidenceCategoryDTO.listCategoryIdPath(id);
if (CollUtil.isNotEmpty(path)){ if (CollUtil.isNotEmpty(path)){
path.add(0,this.id); if (StrUtil.isNotEmpty(this.id)){
path.add(0,this.id);
}
return path; return path;
} }
} }

@ -5,6 +5,7 @@ import cn.hutool.core.date.DateTime;
import cn.hutool.core.lang.Assert; import cn.hutool.core.lang.Assert;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import cn.hutool.json.JSONUtil; import cn.hutool.json.JSONUtil;
import com.baomidou.mybatisplus.core.incrementer.DefaultIdentifierGenerator;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.plugins.pagination.PageDTO; 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) { if (directory.getLevel() == 1 || directory.getLevel() == 2) {
for (String fileId : evidenceFile.getFileIdList()) { for (String fileId : evidenceFile.getFileIdList()) {
CaseEvidenceDetailDTO caseEvidenceDetailDTO = new CaseEvidenceDetailDTO(); CaseEvidenceDetailDTO caseEvidenceDetailDTO = new CaseEvidenceDetailDTO();
// 预先生成证据id
caseEvidenceDetailDTO.setId(DefaultIdentifierGenerator.getInstance().nextId(null).toString());
caseEvidenceDetailDTO.setEvidenceType(directory.getCategoryId()); caseEvidenceDetailDTO.setEvidenceType(directory.getCategoryId());
caseEvidenceDetailDTO.setDirectoryId(directoryId); caseEvidenceDetailDTO.setDirectoryId(directoryId);
EvidenceFileDTO evidenceFileDTO = new EvidenceFileDTO(); EvidenceFileDTO evidenceFileDTO = new EvidenceFileDTO();
@ -953,6 +956,7 @@ public class CaseEvidenceServiceImpl extends ServiceImpl<CaseEvidenceMapper, Cas
caseEvidenceDetailDTO.setEvidenceName(minioFile.getFilename().split("\\.")[0]); caseEvidenceDetailDTO.setEvidenceName(minioFile.getFilename().split("\\.")[0]);
evidenceFileDTO.setFileType(minioFile.getFileType()); evidenceFileDTO.setFileType(minioFile.getFileType());
evidenceFileDTO.setFileName(minioFile.getFilename()); evidenceFileDTO.setFileName(minioFile.getFilename());
evidenceFileDTO.setEvidenceId(caseEvidenceDetailDTO.getId());
} }
caseEvidenceDetailDTO.setFileList(List.of(evidenceFileDTO)); caseEvidenceDetailDTO.setFileList(List.of(evidenceFileDTO));
caseEvidenceDetailDTOS.add(caseEvidenceDetailDTO); caseEvidenceDetailDTOS.add(caseEvidenceDetailDTO);

Loading…
Cancel
Save