From c987cc764e62a9080cc784604938a4ca58b2d235 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期五, 25 四月 2025 11:07:33 +0800
Subject: [PATCH] 代码提交

---
 smartor/src/main/java/com/smartor/service/impl/PatArchiveServiceImpl.java |   16 ++++++++++++++--
 1 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/smartor/src/main/java/com/smartor/service/impl/PatArchiveServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/PatArchiveServiceImpl.java
index 27b10b8..90cb542 100644
--- a/smartor/src/main/java/com/smartor/service/impl/PatArchiveServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/PatArchiveServiceImpl.java
@@ -602,14 +602,26 @@
             patArchive1.setTagList(stringList.stream().collect(Collectors.toList()));
             patArchives.add(patArchive1);
         }
+        //灏唒atArchives閲岀殑tagList鏀惧埌patArchiveList鐨勫璞¢噷
+        for (PatArchiveOthreInfo poi : patArchiveList) {
+            for (PatArchive pa : patArchives) {
+                if (poi.getId() == pa.getId()) {
+                    poi.setTagList(pa.getTagList());
+
+                }
+            }
+        }
+
+        List<PatArchive> patArchiveList1 = DtoConversionUtils.sourceToTarget(patArchiveList, PatArchive.class);
         //缁欐偅鑰呰仈绯讳汉璧嬪��
-        for (PatArchive pa : patArchives) {
+//        for (PatArchive pa : patArchives) {
+        for (PatArchive pa : patArchiveList1) {
             PatArchivecontact patArchivecontact = new PatArchivecontact();
             patArchivecontact.setPatid(pa.getId());
             pa.setPatArchivecontactList(patArchivecontactMapper.selectPatArchivecontactList(patArchivecontact));
         }
 
-        return patArchives;
+        return patArchiveList1;
     }
 
     @Override

--
Gitblit v1.9.3