From e4e220916dd2a4aa649a9b0162e5b5ed0dc9d7e5 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期二, 20 五月 2025 10:36:54 +0800
Subject: [PATCH] 代码提交
---
smartor/src/main/java/com/smartor/service/impl/PatArchiveServiceImpl.java | 24 +++++++++++++++++++-----
1 files changed, 19 insertions(+), 5 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..1786915 100644
--- a/smartor/src/main/java/com/smartor/service/impl/PatArchiveServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/PatArchiveServiceImpl.java
@@ -595,21 +595,35 @@
}
//灏嗘煡鍑虹殑tag锛屾斁鍒皃atArchive1閲岀殑TagList涓�
PatArchivetag patArchivetag = new PatArchivetag();
- patArchivetag.setTagname(list.get(i).getTag());
- patArchivetag.setTagid(list.get(i).getTagid());
- stringList.add(patArchivetag);
+ if (StringUtils.isNotEmpty(list.get(i).getTag()) && ObjectUtils.isNotEmpty(list.get(i).getTagid())) {
+ patArchivetag.setTagname(list.get(i).getTag());
+ patArchivetag.setTagid(list.get(i).getTagid());
+ stringList.add(patArchivetag);
+ }
}
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