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 { */ List 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 - 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}