活动类型名称关联customerId

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

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

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">