From 52d165f3b6837a046c7498b989913c388e44c7ef Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Mon, 22 Aug 2022 10:55:39 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E7=B1=BB=E5=9E=8B=E5=90=8D?=
 =?UTF-8?q?=E7=A7=B0=E5=85=B3=E8=81=94customerId?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/modules/partyOrg/dao/IcPartyActDao.java     | 2 +-
 .../partyOrg/service/impl/IcPartyActServiceImpl.java      | 2 +-
 .../src/main/resources/mapper/partyOrg/IcPartyActDao.xml  | 8 ++++----
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyActDao.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyActDao.java
index febc8ec2ba..9e6f471e6d 100644
--- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyActDao.java
+++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyActDao.java
@@ -37,7 +37,7 @@ public interface IcPartyActDao extends BaseDao<IcPartyActEntity> {
      */
     List<IcPartyActPageResultDTO> selectPageList(IcPartyActPageFormDTO formDTO);
 
-    String selectActTypeName(String actType);
+    String selectActTypeName(@Param("customerId") String customerId,@Param("actType")String actType);
 
     int deleteIcPartyAct(@Param("customerId") String customerId, @Param("userId")String userId, @Param("icPartyActId")String icPartyActId);
 }
\ No newline at end of file
diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java
index de4d785935..eccab1e40a 100644
--- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java
+++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java
@@ -253,7 +253,7 @@ public class IcPartyActServiceImpl extends BaseServiceImpl<IcPartyActDao, IcPart
         }
         IcPartyActDetailResDTO resDTO=ConvertUtils.sourceToTarget(icPartyActEntity,IcPartyActDetailResDTO.class);
         resDTO.setIcPartyActId(icPartyActEntity.getId());
-        resDTO.setActTypeName(baseDao.selectActTypeName(icPartyActEntity.getActType()));
+        resDTO.setActTypeName(baseDao.selectActTypeName(customerId,icPartyActEntity.getActType()));
         //参加人员类型，0：全体党员；1：支部委员
         resDTO.setJoinUserTypeName(NumConstant.ZERO_STR.equals(resDTO.getJoinUserType()) ? "全体党员" : "支部委员");
         resDTO.setAttachmentList(resiPartymemberAttachmentDao.selectListByBusinessId(icPartyActId));
diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml
index 7ef1aca4d1..b3a1173068 100644
--- a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml
+++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml
@@ -84,7 +84,7 @@
             a.PUBLISH_STAFF_ID
         FROM
             ic_party_act a
-                LEFT JOIN ic_party_act_type_dict d ON ( a.ACT_TYPE = d.TYPE_KEY )
+                LEFT JOIN ic_party_act_type_dict d ON ( a.ACT_TYPE = d.TYPE_KEY and a.customer_id=d.customer_id)
         WHERE
             a.DEL_FLAG = '0'
           AND a.CUSTOMER_ID = #{customerId}
@@ -115,13 +115,13 @@
         order by a.HOLD_TIME desc
     </select>
 
-    <select id="selectActTypeName" parameterType="java.lang.String">
+    <select id="selectActTypeName" parameterType="map" resultType="java.lang.String">
         SELECT
             ifnull( d.type_name, '' ) AS typeName
         FROM
             ic_party_act_type_dict d
-        WHERE
-            d.type_key = #{actType}
+        WHERE d.customer_id = #{customerId}
+            and d.type_key = #{actType}
     </select>
 
     <update id="deleteIcPartyAct" parameterType="map">