Merge remote-tracking branch 'origin/lingshan_master' into lingshan_master

epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml

@@ -276,7 +276,7 @@
              , t.TYPE_NAME name
              , count(*) as value
         from ic_party_act a
-            inner join ic_party_act_type_dict t on (a.ACT_TYPE = t.TYPE_KEY and t.DEL_FLAG = 0)
+            inner join ic_party_act_type_dict t on (a.ACT_TYPE = t.TYPE_KEY and t.DEL_FLAG = 0 and a.CUSTOMER_ID=t.CUSTOMER_ID)
         where a.DEL_FLAG = 0
           and a.CUSTOMER_ID = #{customerId}
           and a.ORG_ID_PATH like CONCAT(#{orgIdPath}, '%')