From d3542a1d2d875db6e805756ee19241655dd349c5 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Tue, 11 Oct 2022 13:50:54 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=8F=8D=E5=8F=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dto/form/CollectDetailResultDTO.java      |  3 +++
 .../epmet/dto/result/OrgInfoResultDTO.java    | 23 +++++++++++++++++++
 .../impl/IcResiCollectServiceImpl.java        | 11 +++++++++
 3 files changed, 37 insertions(+)
 create mode 100644 epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/OrgInfoResultDTO.java

diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/CollectDetailResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/CollectDetailResultDTO.java
index 8a71aa8ea9..2631a14625 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/CollectDetailResultDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/CollectDetailResultDTO.java
@@ -1,5 +1,6 @@
 package com.epmet.dto.form;
 
+import com.epmet.dto.result.OrgInfoResultDTO;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -75,4 +76,6 @@ public class CollectDetailResultDTO implements Serializable {
     private List<IcResiCollectMemDetailDTO> memberList;
 
     private String orgIdPath;
+
+    private List<OrgInfoResultDTO> orgIdPathList;
 }
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/OrgInfoResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/OrgInfoResultDTO.java
new file mode 100644
index 0000000000..0905a073b7
--- /dev/null
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/OrgInfoResultDTO.java
@@ -0,0 +1,23 @@
+package com.epmet.dto.result;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @DateTime 2022/10/11 13:41
+ * @DESC
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class OrgInfoResultDTO implements Serializable {
+
+    private static final long serialVersionUID = 7478605833438304330L;
+
+    private String id;
+    private String name;
+}
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiCollectServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiCollectServiceImpl.java
index 3d2cfd552b..18c38f5407 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiCollectServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiCollectServiceImpl.java
@@ -225,6 +225,17 @@ public class IcResiCollectServiceImpl extends BaseServiceImpl<IcResiCollectDao,
         }
         CollectDetailResultDTO result = ConvertUtils.sourceToTarget(entity, CollectDetailResultDTO.class);
         result.setOrgIdPath(StringUtils.isBlank(entity.getPids()) ? entity.getAgencyId() : entity.getPids()+":"+entity.getAgencyId());
+        String[] split = result.getOrgIdPath().split(":");
+        List<OrgInfoResultDTO> orgInfoList = new ArrayList<>();
+        for (String orgId : split) {
+            AgencyInfoCache agencyInfo = CustomerOrgRedis.getAgencyInfo(orgId);
+            if (null == agencyInfo){
+                throw new EpmetException("查询组织信息失败："+orgId);
+            }
+            OrgInfoResultDTO orgInfoResultDTO = new OrgInfoResultDTO(orgId,agencyInfo.getOrganizationName());
+            orgInfoList.add(orgInfoResultDTO);
+        }
+        result.setOrgIdPathList(orgInfoList);
         //查询成员信息
         List<IcResiCollectMemDetailDTO> memberList = icResiMemberDao.selectListByCollectId(dto.getId());
         result.setMemberList(memberList);