Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud into pingyin_master

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

@@ -189,7 +189,7 @@ public class EvaluationIndexServiceImpl implements EvaluationIndexService {
         List<ScreenCustomerGridDTO> gridList = new ArrayList<>();
         List<ScreenAgencyOrGridListDTO.AgencyGrid> finalAgencyGridList = agencyGridList;
         if (isGetSubAllGrid && OrgLevelEnum.STREET.getCode().equals(dto.getLevel())){
-            gridList = evaluationIndexDao.getSubAllGridByAgencyPath(dto.getPids().concat(StrConstant.COLON).concat(dto.getAgencyId()));
+            gridList = evaluationIndexDao.getSubAllGridByAgencyPath(dto.getAgencyId());
             List<ScreenAgencyOrGridListDTO.AgencyGrid> allGridList = new ArrayList<>();
             gridList.forEach(gr->{
                 ScreenAgencyOrGridListDTO.AgencyGrid org = new ScreenAgencyOrGridListDTO.AgencyGrid();

epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/evaluationindex/EvaluationIndexDao.xml

@@ -227,7 +227,7 @@
             screen_customer_grid
         WHERE
             del_flag = '0'
-        AND all_parent_ids LIKE concat(#{fullAgencyPath},'%')
+        AND all_parent_ids LIKE concat('%',#{fullAgencyPath},'%')
         order by parentAgencyId,gridName
     </select>