From b21445f30ea036c106392330480befe28970467c Mon Sep 17 00:00:00 2001
From: xueqingkun <xueqingkun@126.com>
Date: Tue, 26 Nov 2024 14:36:23 +0800
Subject: [PATCH] =?UTF-8?q?1.=20=E4=BF=AE=E5=A4=8D=E7=94=B1=E4=BA=8E?=
 =?UTF-8?q?=E7=BB=93=E6=9E=84=E5=8C=96=E5=AD=98=E5=82=A8=E5=AF=BC=E8=87=B4?=
 =?UTF-8?q?=E7=9A=84=E6=9F=A5=E8=AF=A2=E6=A1=88=E4=BB=B6=E5=8E=9F=E5=AD=90?=
 =?UTF-8?q?=E6=8C=87=E6=A0=87=E5=B1=9E=E6=80=A7=E6=93=8D=E4=BD=9C=E5=9F=9F?=
 =?UTF-8?q?bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../police/service/impl/ModelIndexServiceImpl.java    | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/src/main/java/com/supervision/police/service/impl/ModelIndexServiceImpl.java b/src/main/java/com/supervision/police/service/impl/ModelIndexServiceImpl.java
index a778a21..d74c270 100644
--- a/src/main/java/com/supervision/police/service/impl/ModelIndexServiceImpl.java
+++ b/src/main/java/com/supervision/police/service/impl/ModelIndexServiceImpl.java
@@ -85,6 +85,8 @@ public class ModelIndexServiceImpl extends ServiceImpl<ModelIndexMapper, ModelIn
 
     private final EvidenceCategoryService evidenceCategoryService;
 
+    private final CaseEvidencePropertyService caseEvidencePropertyService;
+
     @Value("${case.evidence.table}")
     private List<String> allowedTables;
 
@@ -404,6 +406,15 @@ public class ModelIndexServiceImpl extends ServiceImpl<ModelIndexMapper, ModelIn
         }
 
         List<NotePrompt> notePrompts = notePromptService.listByIds(promptIds);
+        for (NotePrompt notePrompt : notePrompts) {
+            if (StrUtil.isEmpty(notePrompt.getEvidenceCategoryId())){
+                continue;
+            }
+            List<NotePromptExtractAttributesDto> extractAttributes = caseEvidencePropertyService.findExtractAttributes(notePrompt.getEvidenceCategoryId());
+            if (CollUtil.isNotEmpty(extractAttributes)){
+                notePrompt.setExtractAttributes(extractAttributes);
+            }
+        }
         Map<String, String> dicMap = comDictionaryService.getDictionaryMap("prompt_attribute_valuetype");
 
         for (Map.Entry<String, List<ValueCalculateScopeDTO>> entry : result.entrySet()) {