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

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/CoverageServiceImpl.java

@@ -1234,7 +1234,7 @@ public class CoverageServiceImpl implements CoverageService {
                 }else{
                     gridId=orgRes.getOrgId();
                     GridInfoCache gridInfoCache=CustomerOrgRedis.getGridInfo(orgRes.getOrgId());
-                    orgIdPath=gridInfoCache.getPids().concat(":").concat(gridId);
+                    orgIdPath=gridInfoCache.getPids();
                 }
                 int count = doDataListCount(formDTO.getCustomerId(), agencyId, orgIdPath, formDTO.getPlaceType(), formDTO.getCategoryKey(), null, gridId);
                 orgRes.setTotal(count);

epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/IcEnterprisePatrolRecordDao.xml

@@ -8,8 +8,12 @@
         select count(1)
         from ic_enterprise e
         where e.CUSTOMER_ID = #{customerId}
-          and e.PLACE_ORG_NAME like CONCAT('%',#{search},'%')
+          <if test='null != search and "" != search'>
-          and (e.AGENCY_ID = #{agencyId} or e.AGENCY_PIDS like CONCAT(#{staffOrgIds}, '%'))
+                and e.PLACE_ORG_NAME like CONCAT('%',#{search},'%')
+          </if>
+          <if test="null==gridId || ''==gridId">
+              and (e.AGENCY_ID = #{agencyId} or e.AGENCY_PIDS like CONCAT(#{staffOrgIds}, '%'))
+          </if>
           <if test="'enterprise_patrol_unqualified'!= categoryKey">
               and e.PLACE_TYPE = #{categoryKey}
           </if>