From 150596b198de4fbfec9d83e08edebf1511fa6d89 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Thu, 27 Aug 2020 14:28:53 +0800
Subject: [PATCH 1/2] sql

---
 .../src/main/resources/mapper/screen/ScreenCustomerGridDao.xml | 1 -
 .../src/main/resources/mapper/screen/ScreenEventDataDao.xml    | 3 +--
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenCustomerGridDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenCustomerGridDao.xml
index 123fbbbc75..01d3f4da7d 100644
--- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenCustomerGridDao.xml
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenCustomerGridDao.xml
@@ -28,7 +28,6 @@
             screen_customer_grid
         WHERE
             del_flag = 0
-            AND parent_agency_id = #{agencyId}
             AND all_parent_ids LIKE concat('%', #{agencyId}, '%')
     </select>
 
diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenEventDataDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenEventDataDao.xml
index a484d4549a..750439bb3e 100644
--- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenEventDataDao.xml
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenEventDataDao.xml
@@ -16,8 +16,7 @@
             screen_event_data
         WHERE
             del_flag = '0'
-            AND parent_id = #{parentId}
-            AND all_parent_ids LIKE concat('%', #{agencyId}, '%')
+            AND all_parent_ids LIKE concat('%', #{parentId}, '%')
     </select>
 
     <!-- 项目详情 -->

From b1cf540d9b639885048013e906ed44db1ee27690 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Thu, 27 Aug 2020 14:29:54 +0800
Subject: [PATCH 2/2] =?UTF-8?q?data-report=E6=9C=8D=E5=8A=A1=E5=8D=87?=
 =?UTF-8?q?=E7=BA=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../data-report-server/deploy/docker-compose-dev.yml            | 2 +-
 epmet-module/data-report/data-report-server/pom.xml             | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/epmet-module/data-report/data-report-server/deploy/docker-compose-dev.yml b/epmet-module/data-report/data-report-server/deploy/docker-compose-dev.yml
index 62c198a116..27881e30dc 100644
--- a/epmet-module/data-report/data-report-server/deploy/docker-compose-dev.yml
+++ b/epmet-module/data-report/data-report-server/deploy/docker-compose-dev.yml
@@ -2,7 +2,7 @@ version: "3.7"
 services:
   data-report-server:
     container_name: data-report-server-dev
-    image: 192.168.1.130:10080/epmet-cloud-dev/data-report-server:0.3.45
+    image: 192.168.1.130:10080/epmet-cloud-dev/data-report-server:0.3.46
     ports:
       - "8109:8109"
     network_mode: host # 使用现有网络
diff --git a/epmet-module/data-report/data-report-server/pom.xml b/epmet-module/data-report/data-report-server/pom.xml
index caa70080c2..61415e1d15 100644
--- a/epmet-module/data-report/data-report-server/pom.xml
+++ b/epmet-module/data-report/data-report-server/pom.xml
@@ -3,7 +3,7 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
-    <version>0.3.45</version>
+    <version>0.3.46</version>
     <artifactId>data-report-server</artifactId>
 
     <parent>