From 99ea8a72d80f43d3981cd1dc14112f34384a4f4b Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Thu, 9 Dec 2021 23:55:47 +0800
Subject: [PATCH 1/2] and

---
 .../src/main/resources/mapper/ProjectDao.xml                  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectDao.xml b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectDao.xml
index d71fab0ee2..f3d2d46a62 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectDao.xml
+++ b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectDao.xml
@@ -461,10 +461,10 @@
             AND pc.CUSTOMER_ID = #{customerId}
             AND p.ORIGIN = 'issue'
             AND pc.PROJECT_ID != #{excludeProjectId}
+            AND pc.CATEGORY_CODE LIKE concat( #{categoryCode}, '%' )
             <foreach collection="epmetUserIds" item="epmetUserId" open="AND(  " separator=" OR " index="index" close=")">
-                AND per.USER_ID = #{epmetUserId}
+                 per.USER_ID = #{epmetUserId}
             </foreach>
-            AND pc.CATEGORY_CODE LIKE concat( #{categoryCode}, '%' )
         ORDER BY
             p.CREATED_TIME DESC
     </select>

From bad191abd8294b9629568ca417e93e7c9ada0475 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Fri, 10 Dec 2021 00:06:04 +0800
Subject: [PATCH 2/2] topic

---
 .../src/main/resources/mapper/ProjectDao.xml                   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectDao.xml b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectDao.xml
index f3d2d46a62..5f2a063bab 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectDao.xml
+++ b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectDao.xml
@@ -453,13 +453,14 @@
         FROM
             project_category pc
             INNER JOIN project_related_personnel per ON ( pc.PROJECT_ID = per.PROJECT_ID )
-            INNER JOIN project p
+            INNER JOIN project p on(pc.project_id=p.id)
         WHERE
             pc.DEL_FLAG = '0'
             AND per.DEL_FLAG = '0'
             AND p.DEL_FLAG = '0'
             AND pc.CUSTOMER_ID = #{customerId}
             AND p.ORIGIN = 'issue'
+            and per.SOURCE_TYPE='topic'
             AND pc.PROJECT_ID != #{excludeProjectId}
             AND pc.CATEGORY_CODE LIKE concat( #{categoryCode}, '%' )
             <foreach collection="epmetUserIds" item="epmetUserId" open="AND(  " separator=" OR " index="index" close=")">