From d847bbe737cb0471258f310135d07f0a16868148 Mon Sep 17 00:00:00 2001
From: jianjun <jianjun4833@163.com>
Date: Tue, 29 Mar 2022 22:27:44 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=90=E8=90=A5=E7=AB=AF=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E5=AF=BC=E5=87=BA=20=E5=AD=94=E6=9D=91=E7=9A=84=E7=BA=A7?=
 =?UTF-8?q?=E5=88=AB=E4=B8=8D=E5=AF=B9=20=E5=AF=BC=E8=87=B4=E7=9A=84bug?=
 =?UTF-8?q?=E6=8E=92=E9=99=A4=E5=85=9A=E6=80=BB=E6=94=AF=E8=BF=99..?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../evaluationindex/impl/EvaluationIndexServiceImpl.java     | 2 +-
 .../resources/mapper/evaluationindex/EvaluationIndexDao.xml  | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/evaluationindex/impl/EvaluationIndexServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/evaluationindex/impl/EvaluationIndexServiceImpl.java
index 1d5998dcdd..7fa4518b2d 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/evaluationindex/impl/EvaluationIndexServiceImpl.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/evaluationindex/impl/EvaluationIndexServiceImpl.java
@@ -202,7 +202,7 @@ public class EvaluationIndexServiceImpl implements EvaluationIndexService {
             //2-1.直属下级组织列表
             //2.判断客户是否存在子客户
             List<String> list = customerRelation.haveSubCustomer(dto.getCustomerId());
-            if (!CollectionUtils.isNotEmpty(list)) {
+            if (CollectionUtils.isEmpty(list)) {
                 agencyList = evaluationIndexDao.getSubAgencyListByAgency(agencyId, null, null);
             } else {
                 list.add(dto.getCustomerId());
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/evaluationindex/EvaluationIndexDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/evaluationindex/EvaluationIndexDao.xml
index b66738866f..70c5f2d7d6 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/evaluationindex/EvaluationIndexDao.xml
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/evaluationindex/EvaluationIndexDao.xml
@@ -165,6 +165,11 @@
             <when test="areaCode != null and areaCode.trim() != ''">
                 AND parent_area_code = #{areaCode}
             </when>
+            <!--要孔村的党支部有啥用 还要导出排掉-->
+            <when test="agencyId == '1234085031077498881'">
+                AND PIDS like  concat(#{agencyId},'%')
+                AND LEVEL = 'community'
+            </when>
             <otherwise>
                 AND pid = #{agencyId}
             </otherwise>