From bfa344de0110f334058e55fd0b0eea63b3727c88 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Tue, 17 Aug 2021 16:39:45 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B5=8B=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/ScreenProjectCategoryOrgDailyServiceImpl.java       | 5 +++++
 .../screen/ScreenProjectCategoryOrgDailyDao.xml              | 3 ++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenProjectCategoryOrgDailyServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenProjectCategoryOrgDailyServiceImpl.java
index 44436cbe95..952714b943 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenProjectCategoryOrgDailyServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenProjectCategoryOrgDailyServiceImpl.java
@@ -454,6 +454,11 @@ public class ScreenProjectCategoryOrgDailyServiceImpl extends BaseServiceImpl<Sc
                 List<ScreenProjectCategoryOrgDailyEntity> falseList = groupByStatus.get(false);
                 if (!CollectionUtils.isEmpty(falseList)){
                     result.addAll(falseList);
+                    result.forEach(r -> {
+                        r.setCustomerId(customerId);
+                        r.setOrgId(entity.getAgencyId());
+                        r.setPid(entity.getPid());
+                    });
                 }
                 // 添加此 锦水、孔村、榆山 orgId，删除时使用
                 orgIds.add(PingYinConstant.JIN_SHUI_AGENCY_ID);
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenProjectCategoryOrgDailyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenProjectCategoryOrgDailyDao.xml
index 163afbee13..45b2e99308 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenProjectCategoryOrgDailyDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenProjectCategoryOrgDailyDao.xml
@@ -79,9 +79,10 @@
     <!-- 查询内部客户组织的项目分类 -->
     <select id="selectSelfAgencyCategory" resultType="com.epmet.dto.screen.result.CategoryProjectResultDTO">
         SELECT
-            od.pid AS orgId,
+            IF(od.pid = '0', od.ORG_ID,od.pid) AS orgId,
             IFNULL(sca.PID,'0') AS pid,
             IFNULL(sca.PIDS,'0') AS pids,
+            od.CUSTOMER_ID,
             od.level,
             od.CATEGORY_CODE,
             IFNULL(SUM(od.PROJECT_TOTAL),0) AS projectTotal,