From 0889bec4abc655ae1da240f58b3f4eb1ff985887 Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Tue, 25 Jan 2022 10:40:15 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=A0=94=E5=88=A4=E5=88=86?=
 =?UTF-8?q?=E6=9E=90=E6=8C=89=E5=88=86=E7=B1=BB=E6=9F=A5=E8=AF=A2=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E5=85=BC=E5=AE=B9=E5=B8=82=E5=8C=97=E5=A4=9A=E5=B1=82?=
 =?UTF-8?q?=E7=BA=A7=E5=88=86=E7=B1=BB=E4=BB=A5=E5=8F=8A=E4=B8=8D=E6=98=AF?=
 =?UTF-8?q?=E6=9D=A5=E6=BA=90=E8=AF=9D=E9=A2=98=E7=9A=84=E8=AE=AE=E9=A2=98?=
 =?UTF-8?q?=E8=A1=A5=E5=BD=95=E4=B8=80=E6=9D=A1=E5=85=B3=E4=BA=8E=E8=AF=9D?=
 =?UTF-8?q?=E9=A2=98=E6=95=B0=E6=8D=AE(project=5Frelated=5Fpersonnel)=20?=
 =?UTF-8?q?=E8=AF=9D=E9=A2=98id=E4=B8=BA=E7=A9=BA=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../govproject/impl/GovProjectServiceImpl.java    |  3 ++-
 .../resources/mapper/govproject/ProjectDao.xml    | 15 ++++++++++++---
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java
index a9f42eedd3..6ea7acf652 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java
@@ -1,6 +1,7 @@
 package com.epmet.dataaggre.service.govproject.impl;
 
 import com.epmet.commons.dynamic.datasource.annotation.DataSource;
+import com.epmet.commons.tools.constant.CustomerIdConstant;
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.constant.StrConstant;
 import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult;
@@ -559,7 +560,7 @@ public class GovProjectServiceImpl implements GovProjectService {
 		})).collect(Collectors.toList());
 
 		//4.根据userId集合和二级分类Code集合查询来源楼院小组的项目
-		List<ProjectCategoryResultDTO> groupList = projectDao.getProjectCategoryList(formDTO.getCustomerId(), secondCodeList, userIds, "issue");
+		List<ProjectCategoryResultDTO> groupList = projectDao.getProjectCategoryList(formDTO.getCustomerId(), (CustomerIdConstant.SHI_BEI_CUSTOMER_ID.equals(formDTO.getCustomerId()) ? null : secondCodeList), userIds, "issue");
 
 		//5.根据userId集合和二级分类Code集合查询来源事件上报的项目
 		List<ProjectCategoryResultDTO> eventList = projectDao.getProjectCategoryList(formDTO.getCustomerId(), secondCodeList, userIds, "resiEvent");
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govproject/ProjectDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govproject/ProjectDao.xml
index 599a5da471..ea4c01f111 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govproject/ProjectDao.xml
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govproject/ProjectDao.xml
@@ -363,9 +363,18 @@
             p.del_flag = '0'
         AND p.customer_id = #{customerId}
         AND p.origin = #{origin}
-        <foreach collection="secondCodeList" item="code" open="AND pc.category_code IN (" separator="," close=")">
-            #{code}
-        </foreach>
+        <choose>
+            <when test="null != secondCodeList and secondCodeList.size > 0">
+                <foreach collection="secondCodeList" item="code" open="AND pc.category_code IN (" separator="," close=")">
+                    #{code}
+                </foreach>
+            </when>
+            <otherwise>
+                <foreach collection="secondCodeList" item="code" open="AND (" separator=" OR "  close=" )" >
+                    pc.category_code LIKE CONCAT(#{code}, '%')
+                </foreach>
+            </otherwise>
+        </choose>
         <if test="origin != null and origin != '' and origin == 'issue'">
             <foreach collection="userIds" item="userId" open="AND prp.user_id IN (" separator="," close=")">
                 #{userId}