From 6fda7a5d57d35e15426a23a1534e26c60443d781 Mon Sep 17 00:00:00 2001
From: Jackwang <wt373747285@163.com>
Date: Mon, 13 Jun 2022 15:05:54 +0800
Subject: [PATCH] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E4=B8=8A=E7=BA=A7=E5=85=9A?=
 =?UTF-8?q?=E7=BB=84=E7=BB=87=E5=88=97=E8=A1=A8=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/epmet/modules/partyOrg/dao/IcPartyOrgDao.java | 3 ++-
 .../partyOrg/service/impl/IcPartyOrgServiceImpl.java       | 4 ++--
 .../src/main/resources/mapper/partyOrg/IcPartyOrgDao.xml   | 7 ++++++-
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyOrgDao.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyOrgDao.java
index c70ca0d728..93fa4d8a64 100644
--- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyOrgDao.java
+++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyOrgDao.java
@@ -91,7 +91,8 @@ public interface IcPartyOrgDao extends BaseDao<IcPartyOrgEntity> {
     * @params [agencyPid, customerId, code]
     * @return java.util.List<com.epmet.resi.partymember.dto.partyOrg.result.IcPartyOrgTreeDTO>
     */
-    List<IcPartyOrgTreeDTO> selectParentOrgByAgencyPid(@Param("agencyPid") String agencyPid,
+    List<IcPartyOrgTreeDTO> selectParentOrgByAgencyPid(@Param("agencyId") String agencyId,
+                                                       @Param("agencyPid") String agencyPid,
                                                        @Param("customerId") String customerId,
                                                        @Param("partyOrgType") String partyOrgType);
 
diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyOrgServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyOrgServiceImpl.java
index d41d9eaa8b..70cb443864 100644
--- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyOrgServiceImpl.java
+++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyOrgServiceImpl.java
@@ -262,10 +262,10 @@ public class IcPartyOrgServiceImpl extends BaseServiceImpl<IcPartyOrgDao, IcPart
         }
         //如果类型为支部，则查询该行政组织下的所有党委(列表)
         if(PartyOrgTypeEnum.BRANCH.getCode().equals(formDTO.getPartyOrgType())){
-            list.addAll(baseDao.selectParentOrgByAgencyPid(agencyPid,formDTO.getCustomerId(),PartyOrgTypeEnum.PARTY.getCode()));
+            list.addAll(baseDao.selectParentOrgByAgencyPid(formDTO.getAgencyId(),null,formDTO.getCustomerId(),PartyOrgTypeEnum.PARTY.getCode()));
         }else{
             //查询该行政组织对应上级所关联的党组织(单个实体类)
-            list.addAll(baseDao.selectParentOrgByAgencyPid(agencyPid,formDTO.getCustomerId(),null));
+            list.addAll(baseDao.selectParentOrgByAgencyPid(null,agencyPid,formDTO.getCustomerId(),null));
         }
         return new Result<List<IcPartyOrgTreeDTO>>().ok(list);
     }
diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyOrgDao.xml b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyOrgDao.xml
index 959b99a790..1af1738da2 100644
--- a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyOrgDao.xml
+++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyOrgDao.xml
@@ -128,7 +128,12 @@
         from ic_party_org
         where DEL_FLAG = 0
                 and CUSTOMER_ID=#{customerId}
-                and AGENCY_ID=#{agencyPid}
+                <if test="agencyId != null and agencyId != ''">
+                    AND (AGENCY_ID = #{agencyId} or AGENCY_PIDS LIKE concat('%',#{agencyId}, '%' ))
+                </if>
+                <if test="agencyPid != null and agencyPid != ''">
+                    and AGENCY_ID=#{agencyPid}
+                </if>
                 <if test="partyOrgType != null and partyOrgType != ''">
                     and PARTY_ORG_TYPE = #{partyOrgType}
                 </if>