From f825c44b349618d8e830f126c4a398dc708cd4ce Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Tue, 21 Jun 2022 15:24:40 +0800
Subject: [PATCH] =?UTF-8?q?ic=5Fcommunity=5Fself=5Forganization=5Fpersonne?=
 =?UTF-8?q?l=E3=80=82IC=5FRESI=5FUSER=5FID?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet/dto/IcCommunitySelfOrganizationPersonnelDTO.java  | 5 +++++
 .../epmet/dto/result/CommunitySelfOrganizationListDTO.java  | 5 +++++
 .../entity/IcCommunitySelfOrganizationPersonnelEntity.java  | 5 +++++
 .../impl/IcCommunitySelfOrganizationServiceImpl.java        | 1 +
 .../db/migration/V0.0.20__selforg_icresiuserid.sql          | 1 +
 .../resources/mapper/IcCommunitySelfOrganizationDao.xml     | 6 ++++--
 6 files changed, 21 insertions(+), 2 deletions(-)
 create mode 100644 epmet-module/epmet-heart/epmet-heart-server/src/main/resources/db/migration/V0.0.20__selforg_icresiuserid.sql

diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/IcCommunitySelfOrganizationPersonnelDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/IcCommunitySelfOrganizationPersonnelDTO.java
index 95ad773777..cb4d897091 100644
--- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/IcCommunitySelfOrganizationPersonnelDTO.java
+++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/IcCommunitySelfOrganizationPersonnelDTO.java
@@ -51,6 +51,11 @@ public class IcCommunitySelfOrganizationPersonnelDTO implements Serializable {
      */
 	private String orgId;
 
+    /**
+     * 居民信息当中的志愿者ic_resi_user.id
+     */
+    private String icResiUserId;
+
     /**
      * 人员姓名
      */
diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/CommunitySelfOrganizationListDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/CommunitySelfOrganizationListDTO.java
index 563ccf0928..331fbf3413 100644
--- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/CommunitySelfOrganizationListDTO.java
+++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/CommunitySelfOrganizationListDTO.java
@@ -18,6 +18,11 @@ public class CommunitySelfOrganizationListDTO implements Serializable {
 
     private static final long serialVersionUID = 3208034033470533749L;
 
+    /**
+     * 本条记录所属组织id
+     */
+    private String agencyId;
+
     /**
      * 排序
      */
diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/IcCommunitySelfOrganizationPersonnelEntity.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/IcCommunitySelfOrganizationPersonnelEntity.java
index c313f367fc..03b9b81d00 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/IcCommunitySelfOrganizationPersonnelEntity.java
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/IcCommunitySelfOrganizationPersonnelEntity.java
@@ -45,6 +45,11 @@ public class IcCommunitySelfOrganizationPersonnelEntity extends BaseEpmetEntity
      */
 	private String orgId;
 
+	/**
+	 * 居民信息当中的志愿者ic_resi_user.id
+	 */
+	private String icResiUserId;
+
     /**
      * 人员姓名
      */
diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcCommunitySelfOrganizationServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcCommunitySelfOrganizationServiceImpl.java
index 7f6eee3a8f..3855b270e2 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcCommunitySelfOrganizationServiceImpl.java
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcCommunitySelfOrganizationServiceImpl.java
@@ -320,6 +320,7 @@ public class IcCommunitySelfOrganizationServiceImpl extends BaseServiceImpl<IcCo
         if (CollectionUtils.isNotEmpty(servicePointList)){
             pointMap = servicePointList.stream().collect(Collectors.toMap(ServicePointDTO::getServerId, ServicePointDTO::getPoint));
         }
+        //当前工作人员所属的组织id
         formDTO.setAgencyId(staffInfo.getAgencyId());
         formDTO.setCustomerId(tokenDto.getCustomerId());
         final int[] i = {(formDTO.getPageNo() - NumConstant.ONE) * formDTO.getPageSize() + NumConstant.ONE};
diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/db/migration/V0.0.20__selforg_icresiuserid.sql b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/db/migration/V0.0.20__selforg_icresiuserid.sql
new file mode 100644
index 0000000000..ea9ce8bbba
--- /dev/null
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/db/migration/V0.0.20__selforg_icresiuserid.sql
@@ -0,0 +1 @@
+alter table ic_community_self_organization_personnel add COLUMN IC_RESI_USER_ID VARCHAR(64) DEFAULT '' COMMENT '居民信息当中的志愿者ic_resi_user.id'AFTER ORG_ID;
\ No newline at end of file
diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcCommunitySelfOrganizationDao.xml b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcCommunitySelfOrganizationDao.xml
index bb705fc32a..c6e34a86fa 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcCommunitySelfOrganizationDao.xml
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcCommunitySelfOrganizationDao.xml
@@ -42,13 +42,15 @@
                person_phone as personPhone,
                ID,
                CUSTOMER_ID,
-               ORG_ID
+               ORG_ID,
+               IC_RESI_USER_ID
         from ic_community_self_organization_personnel
         where org_id = #{orgId}
             and del_flag = 0
     </select>
     <select id="selectCommunitySelfOrganizationList" resultMap="selectCommunitySelfOrganizationListMap" parameterType="com.epmet.dto.form.CommunitySelfOrganizationListFormDTO">
         SELECT
+            so.ORG_ID as agencyId,
             so.ORGANIZATION_NAME AS organizationName,
             so.CATEGORY_CODE AS categoryCode,
             so.ORGANIZATION_PERSON_COUNT AS organizationPersonCount,
@@ -63,7 +65,7 @@
         FROM ic_community_self_organization so
         WHERE so.DEL_FLAG = 0
             <if test="null != agencyId and agencyId != '' ">
-                AND so.ORG_ID = #{agencyId}
+                AND (so.ORG_ID = #{agencyId} or so.PIDS like concat('%',#{agencyId},'%') )
             </if>
             AND so.CUSTOMER_ID = #{customerId}
             <if test="null != organizationName and organizationName != '' ">