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

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyActivityServiceImpl.java

@@ -339,7 +339,8 @@ public class IcPartyActivityServiceImpl extends BaseServiceImpl<IcPartyActivityD
         }
         PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize());
         LambdaQueryWrapper<IcPartyActivityEntity> wrapper = new LambdaQueryWrapper<>();
-        wrapper.eq(IcPartyActivityEntity::getAgencyId, formDTO.getAgencyId());
+        wrapper.and(wp -> wp.eq(IcPartyActivityEntity::getAgencyId, formDTO.getAgencyId()).or().
+                like(IcPartyActivityEntity::getPids, formDTO.getAgencyId()));
         wrapper.eq(StringUtils.isNotBlank(formDTO.getServiceMatter()), IcPartyActivityEntity::getServiceMatter, formDTO.getServiceMatter());
         wrapper.ge(null != formDTO.getStartTime(),IcPartyActivityEntity::getActivityTime, formDTO.getStartTime());
         wrapper.le(null != formDTO.getEndTime(), IcPartyActivityEntity::getActivityTime, formDTO.getEndTime());