From 08cc15cb1a9ef90a8a05d0d578792fffea05dc51 Mon Sep 17 00:00:00 2001
From: wanggongfeng <1305282856@qq.com>
Date: Tue, 9 Aug 2022 16:13:55 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=A1=E6=81=AF=E9=87=87=E9=9B=86=E5=AE=A1?=
 =?UTF-8?q?=E6=A0=B8=E6=8C=89=E9=92=AE=E6=B7=BB=E5=8A=A0=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/epmet/dto/result/CollectListResultDTO.java   | 3 +++
 .../src/main/resources/mapper/IcResiCollectDao.xml             | 2 ++
 2 files changed, 5 insertions(+)

diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/CollectListResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/CollectListResultDTO.java
index 01bef55958..9851be6340 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/CollectListResultDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/CollectListResultDTO.java
@@ -24,6 +24,9 @@ public class CollectListResultDTO implements Serializable {
     // @JsonIgnore
     private String id;
 
+    // 组织Id
+    private String agencyId;
+
     /**
      * 居住地址
      */
diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiCollectDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiCollectDao.xml
index 8e35bf93fe..c7a3bcd91f 100644
--- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiCollectDao.xml
+++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiCollectDao.xml
@@ -18,6 +18,7 @@
         <result property="totalResi" column="totalResi"/>
         <result property="homeId" column="homeId"/>
         <result property="checkState" column="checkState"/>
+        <result property="agencyId" column="agencyId"/>
         <result property="domicilePlace" column="domicilePlace"></result>
         <collection property="list" ofType="com.epmet.dto.result.CollectListResultDTO$CollectListMemberResultDTO" column="{id=id,domicilePlace=domicile_place}" select="selectMemberList"/>
     </resultMap>
@@ -30,6 +31,7 @@
             c.TOTAL_RESI AS totalResi,
             c.HOME_ID as homeId,
             c.CHECK_STATE as checkState,
+            c.AGENCY_ID as agencyId,
             #{domicilePlace} as domicile_place
         FROM ic_resi_collect c
         left join ic_resi_member m on(c.id=m.IC_RESI_COLLECT_ID and m.del_flag='0')