ic_community_self_organization_personnel。IC_RESI_USER_ID

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;
+
     /**
      * 人员姓名
      */

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;
+
     /**
      * 排序
      */

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;
+
     /**
      * 人员姓名
      */

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};

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;

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 != '' ">