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

@@ -187,7 +187,7 @@ public class EvaluationIndexServiceImpl implements EvaluationIndexService {
         List<ScreenCustomerAgencyDTO> agencyList = new ArrayList<>();
         List<ScreenCustomerGridDTO> gridList = new ArrayList<>();
         //孔村和组织级别为街道的查询下级所有网格
-        if (isGetSubAllGrid && OrgLevelEnum.STREET.getCode().equals(dto.getLevel()) || "1234085031077498881".equals(agencyId)){
+        if (isGetSubAllGrid && (OrgLevelEnum.STREET.getCode().equals(dto.getLevel()) || "1234085031077498881".equals(agencyId))){
             gridList = evaluationIndexDao.getSubAllGridByAgencyPath(dto.getAgencyId());
             List<ScreenAgencyOrGridListDTO.AgencyGrid> allGridList = new ArrayList<>();
             gridList.forEach(gr->{