From 2ff0f918fce79f3e8a0285c403a274cf1082936c Mon Sep 17 00:00:00 2001 From: xueqingkun Date: Fri, 20 Dec 2024 15:18:26 +0800 Subject: [PATCH 1/2] =?UTF-8?q?1.=20=E4=BF=AE=E6=94=B9=E8=AF=81=E6=8D=AE?= =?UTF-8?q?=E5=B1=9E=E6=80=A7=E8=AF=A6=E6=83=85=E4=B8=BA=E7=A9=BA=E5=B1=95?= =?UTF-8?q?=E7=A4=BA=E6=9C=AAnull=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../police/service/impl/CaseEvidencePropertyServiceImpl.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/supervision/police/service/impl/CaseEvidencePropertyServiceImpl.java b/src/main/java/com/supervision/police/service/impl/CaseEvidencePropertyServiceImpl.java index 2523abe..17a2fe2 100644 --- a/src/main/java/com/supervision/police/service/impl/CaseEvidencePropertyServiceImpl.java +++ b/src/main/java/com/supervision/police/service/impl/CaseEvidencePropertyServiceImpl.java @@ -268,7 +268,9 @@ public class CaseEvidencePropertyServiceImpl implements CaseEvidencePropertyServ Field field = beanDesc.getField(StrUtil.toCamelCase(entry.getKey())); NotePromptExtractAttributesDto attributesDto = new NotePromptExtractAttributesDto(); attributesDto.setAttrName(getFieldDesc(field)); - attributesDto.setAttrValue(StrUtil.toString(entry.getValue())); + if (StrUtil.isNotEmpty(attributesDto.getAttrValue())){ + attributesDto.setAttrValue(StrUtil.toString(entry.getValue())); + } attributesDto.setAttrValueType(getFieldType(field)); return attributesDto; }).filter(a->StrUtil.isNotEmpty(a.getAttrName())).toList(); From d5151811ca6ccb1416a9e008b98b5ec48dd08fe0 Mon Sep 17 00:00:00 2001 From: xueqingkun Date: Fri, 20 Dec 2024 16:05:44 +0800 Subject: [PATCH 2/2] =?UTF-8?q?1.=20=E4=BF=AE=E6=94=B9=E8=AF=81=E6=8D=AE?= =?UTF-8?q?=E5=B1=9E=E6=80=A7=E8=AF=A6=E6=83=85=E4=B8=BA=E7=A9=BA=E5=B1=95?= =?UTF-8?q?=E7=A4=BA=E6=9C=AAnull=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../police/service/impl/CaseEvidencePropertyServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/supervision/police/service/impl/CaseEvidencePropertyServiceImpl.java b/src/main/java/com/supervision/police/service/impl/CaseEvidencePropertyServiceImpl.java index 17a2fe2..9004291 100644 --- a/src/main/java/com/supervision/police/service/impl/CaseEvidencePropertyServiceImpl.java +++ b/src/main/java/com/supervision/police/service/impl/CaseEvidencePropertyServiceImpl.java @@ -268,7 +268,7 @@ public class CaseEvidencePropertyServiceImpl implements CaseEvidencePropertyServ Field field = beanDesc.getField(StrUtil.toCamelCase(entry.getKey())); NotePromptExtractAttributesDto attributesDto = new NotePromptExtractAttributesDto(); attributesDto.setAttrName(getFieldDesc(field)); - if (StrUtil.isNotEmpty(attributesDto.getAttrValue())){ + if (null != entry.getValue()){ attributesDto.setAttrValue(StrUtil.toString(entry.getValue())); } attributesDto.setAttrValueType(getFieldType(field));