Merge branch 'dev_bugfix_ljj' into dev

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenCustomerAgencyDao.java

@@ -207,7 +207,7 @@ public interface ScreenCustomerAgencyDao extends BaseDao<ScreenCustomerAgencyEnt
      */
     List<ScreenProjectOrgDailyDTO> selectAgencyByCustomer(@Param("customerId")String customerId);
 
-    List<ScreenProjectOrgDailyDTO> selectAgencyByAreaCode(String areaCode);
+    List<ScreenProjectOrgDailyDTO> selectAgencyByAreaCode(@Param("customerId") String customerId, @Param("areaCode") String areaCode);
 
     /**
      * @Description  根据areaCode查询下级组织

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenProjectOrgDailyServiceImpl.java

@@ -220,7 +220,7 @@ public class ScreenProjectOrgDailyServiceImpl extends BaseServiceImpl<ScreenProj
      */
     public void extractionProjectOrgDailyMoreCustomer(String customerId, String dateId){
         CustomerAgencyEntity rootAgency=customerAgencyService.getRootAgencyInfo(customerId);
-        List<ScreenProjectOrgDailyDTO> agencyInfos = agencyDao.selectAgencyByAreaCode(rootAgency.getAreaCode());
+        List<ScreenProjectOrgDailyDTO> agencyInfos = agencyDao.selectAgencyByAreaCode(null, rootAgency.getAreaCode());
         if (CollectionUtils.isEmpty(agencyInfos)){
             log.warn(String.format(PingYinConstants.AGENCY_INFO_IS_ZERO,customerId));
             return;

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenProjectQuantityOrgMonthlyServiceImpl.java

@@ -245,7 +245,7 @@ public class ScreenProjectQuantityOrgMonthlyServiceImpl extends BaseServiceImpl<
      */
     public void extractionProjectOrgMonthlyMoreCustomer(String customerId,String monthId){
         CustomerAgencyEntity rootAgency=customerAgencyService.getRootAgencyInfo(customerId);
-        List<ScreenProjectOrgDailyDTO> screenProjectOrgDailyDTOS=agencyDao.selectAgencyByAreaCode(rootAgency.getAreaCode());
+        List<ScreenProjectOrgDailyDTO> screenProjectOrgDailyDTOS=agencyDao.selectAgencyByAreaCode(customerId, rootAgency.getAreaCode());
         if (CollectionUtils.isEmpty(screenProjectOrgDailyDTOS)){
             log.warn(String.format(PingYinConstants.AGENCY_INFO_IS_ZERO,customerId));
             return;

epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenCustomerAgencyDao.xml

@@ -391,6 +391,7 @@
         FROM screen_customer_agency sca
         WHERE DEL_FLAG = 0
         and sca.AREA_CODE like CONCAT(#{areaCode},'%')
+        AND sca.customer_id = #{customerId}
     </select>
 
     <!-- 根据areaCode查询下级组织 -->