From 1d7fc9c6b4688c0a38910db647b7a85e9c6c1946 Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Thu, 23 Sep 2021 10:08:38 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=AF=BC=E5=87=BA?=
 =?UTF-8?q?=E4=B8=8E=E5=B0=8F=E7=A8=8B=E5=BA=8F=E6=95=B0=E6=8D=AE=E4=BF=9D?=
 =?UTF-8?q?=E6=8C=81=E4=B8=80=E8=87=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/datastats/DatsStatsDao.xml      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/datastats/DatsStatsDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/datastats/DatsStatsDao.xml
index 0850b865c5..5c25d1edee 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/datastats/DatsStatsDao.xml
+++ b/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}

From 3f6337ac9e9c732108bd928e255300f867513426 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Thu, 23 Sep 2021 10:13:52 +0800
Subject: [PATCH 2/2] bug#3356

---
 .../service/evaluationindex/screen/impl/AgencyServiceImpl.java  | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/AgencyServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/AgencyServiceImpl.java
index 8b45ddb6ef..0c27cbc878 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/AgencyServiceImpl.java
+++ b/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)){
                     //单客户，存在上级时查询...