Merge remote-tracking branch 'origin/dev'

epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/datastats/DatsStatsDao.xml

@@ -887,7 +887,7 @@
             <choose>
                 <when test='dataType == "agency"'>
                     , agency_id orgId
-                    FROM fact_topic_total_agency_daily
+                    FROM fact_topic_hotdiscuss_agency_daily
                     WHERE del_flag = '0'
                     <foreach collection="idList" item="id" open="AND agency_id IN (" separator="," close=")">
                         #{id}
@@ -895,7 +895,7 @@
                 </when>
                 <otherwise>
                     , grid_id orgId
-                    FROM fact_topic_total_grid_daily
+                    FROM fact_topic_hotdiscuss_grid_daily
                     WHERE del_flag = '0'
                     <foreach collection="idList" item="id" open="AND grid_id IN (" separator="," close=")">
                         #{id}

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/AgencyServiceImpl.java

@@ -464,6 +464,8 @@ public class AgencyServiceImpl implements AgencyService {
                     pidList= Arrays.asList(customerAgencyDTO.getPids().split(StrConstant.COLON));
                 }else if(customerAgencyDTO.getPids().contains(StrConstant.COMMA)){
                     pidList= Arrays.asList(customerAgencyDTO.getPids().split(StrConstant.COMMA));
+                } else if (customerAgencyDTO.getPid().equals(customerAgencyDTO.getPids())) {
+                    pidList.add(customerAgencyDTO.getPids());
                 }
                 if(!CollectionUtils.isEmpty(pidList)){
                     //单客户，存在上级时查询...