Merge remote-tracking branch 'origin/dev_party_helper'

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartymemberInfoServiceImpl.java

@@ -265,6 +265,7 @@ public class PartymemberInfoServiceImpl extends BaseServiceImpl<PartymemberInfoD
 		LambdaUpdateWrapper<PartymemberInfoEntity> updateWrapper=new LambdaUpdateWrapper<>();
 		updateWrapper.eq(PartymemberInfoEntity::getUserId,userId);
 		updateWrapper.set(PartymemberInfoEntity::getIdCard,idNum);
+		updateWrapper.set(PartymemberInfoEntity::getUpdatedTime,new Date());
 		baseDao.update(null,updateWrapper);
 	}
 }

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

@@ -226,7 +226,7 @@
         WHERE
             del_flag = '0'
         AND party_org_type = '5'
-        AND agency_pids LIKE CONCAT('%', #{agencyId}, '%')
+        AND (AGENCY_ID = #{agencyId} OR agency_pids LIKE CONCAT('%', #{agencyId}, '%'))
         ORDER BY org_pids ASC
     </select>