From 8c6971b26886420efa552fe58eebeccfa9a6e631 Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Fri, 26 Nov 2021 17:38:47 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=BC=E5=AE=B9=E5=AD=94=E6=9D=91=E7=BB=84?=
 =?UTF-8?q?=E7=BB=87=E5=B1=82=E7=BA=A7=E5=A4=9A=E4=B8=80=E5=B1=82=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../screen/dto/result/CompartmentResultDTO.java              | 5 +++++
 .../datareport/service/fact/impl/FactIndexServiceImpl.java   | 2 +-
 .../main/resources/mapper/screen/ScreenCustomerAgencyDao.xml | 1 +
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/CompartmentResultDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/CompartmentResultDTO.java
index 9e941152e4..52b0f9fa36 100644
--- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/CompartmentResultDTO.java
+++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/CompartmentResultDTO.java
@@ -16,6 +16,11 @@ public class CompartmentResultDTO implements Serializable {
 
     private static final long serialVersionUID = 7963177476365327829L;
 
+    /**
+     *  组织对应的客户Id
+     */
+    private String customerId = "";
+
     /**
      * 当前所选组织
      */
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/fact/impl/FactIndexServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/fact/impl/FactIndexServiceImpl.java
index 80d2161ebb..88b92ef204 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/fact/impl/FactIndexServiceImpl.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/fact/impl/FactIndexServiceImpl.java
@@ -305,7 +305,7 @@ public class FactIndexServiceImpl implements FactIndexService {
             //3.根据组织级别拼接查询条件，判断查询不同数据表
             //区县级、乡镇街道级
             if ("district".equals(agency.getAgencyLevel()) || "street".equals(agency.getAgencyLevel())) {
-                if ("district".equals(agency.getAgencyLevel())) {
+                if ("district".equals(agency.getAgencyLevel()) && !"2fe0065f70ca0e23ce4c26fca5f1d933".equals(agency.getCustomerId())) {
                     formDTO.setAllParentIndexCode(FactConstant.QUAN_QU_XIANG_GUAN + ":" + formDTO.getIndexCode());
                 } else {
                     formDTO.setAllParentIndexCode(FactConstant.JIE_DAO_XIANG_GUAN + ":" + formDTO.getIndexCode());
diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenCustomerAgencyDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenCustomerAgencyDao.xml
index 16c1b42383..0b619b742a 100644
--- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenCustomerAgencyDao.xml
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenCustomerAgencyDao.xml
@@ -192,6 +192,7 @@
 
     <select id="getAgencyInfoByAegncyId" resultType="com.epmet.evaluationindex.screen.dto.result.CompartmentResultDTO">
         SELECT
+                CUSTOMER_ID AS customerId,
                 agency_id AS agencyId,
                 agency_name AS name,
                 level AS level,