diff --git a/src/main/java/com/supervision/police/dto/CaseEvidenceDTO.java b/src/main/java/com/supervision/police/dto/CaseEvidenceDTO.java index 19388aa..fecbcdf 100644 --- a/src/main/java/com/supervision/police/dto/CaseEvidenceDTO.java +++ b/src/main/java/com/supervision/police/dto/CaseEvidenceDTO.java @@ -1,5 +1,7 @@ package com.supervision.police.dto; +import cn.hutool.core.util.StrUtil; +import com.supervision.constant.EvidencePropertyName; import com.supervision.police.domain.CaseEvidence; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @@ -53,4 +55,10 @@ public class CaseEvidenceDTO { caseEvidence.setPartyB(this.partyB); return caseEvidence; } + + public void setTitleProperty(){ + if (StrUtil.isNotEmpty(this.evidenceName)){ + this.property.put(EvidencePropertyName.TITLE.getName(), this.evidenceName); + } + } } 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 6f3865f..cedd47f 100644 --- a/src/main/java/com/supervision/police/service/impl/CaseEvidenceServiceImpl.java +++ b/src/main/java/com/supervision/police/service/impl/CaseEvidenceServiceImpl.java @@ -1,13 +1,11 @@ package com.supervision.police.service.impl; -import cn.hutool.core.collection.CollUtil; import cn.hutool.core.lang.Assert; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.PageDTO; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.supervision.police.domain.FileEvidenceProperty; import com.supervision.police.dto.RecordFileDTO; import com.supervision.police.service.*; import com.supervision.police.domain.CaseEvidence; @@ -97,6 +95,7 @@ public class CaseEvidenceServiceImpl extends ServiceImpl new FileEvidenceProperty(evidenceId, fileId, evidence.getName(), propertyMap.get(evidence.getName()))) + .filter(property -> StrUtil.isNotEmpty(property.getPropertyValue())) .toList(); }