From 00376eecd987aec0b4b09e46e420d9bedc014ff7 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Tue, 24 May 2022 10:34:11 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/ProjectDao.xml  | 32 ++++++++++++++-----
 1 file changed, 24 insertions(+), 8 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 e01a45275c..19e082d341 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
@@ -578,14 +578,30 @@
             t.*
         FROM
             (SELECT
-                  DISTINCT pp.PROJECT_ID,
-                  pp.INTERNAL_REMARK,
-                  pp.PUBLIC_REPLY AS projectScheme
-             FROM project_process pp
-             WHERE DEL_FLAG = '0'
-               AND pp.STAFF_ID = #{userId}
-               AND pp.ORG_ID_PATH LIKE CONCAT('%',#{agencyId})
-             ORDER BY pp.CREATED_TIME DESC) t
+                DISTINCT t.PROJECT_ID,
+                t.INTERNAL_REMARK,
+                t.projectScheme
+            FROM (
+                (SELECT
+                    DISTINCT pp.PROJECT_ID,
+                    pp.INTERNAL_REMARK,
+                    pp.PUBLIC_REPLY AS projectScheme
+                FROM project_process pp
+                WHERE DEL_FLAG = '0'
+                    AND pp.STAFF_ID = #{userId}
+                    AND pp.ORG_ID_PATH LIKE CONCAT('%',#{agencyId})
+                ORDER BY pp.CREATED_TIME DESC)
+                UNION ALL
+                (SELECT
+                    DISTINCT ps.PROJECT_ID ,
+                    pp.INTERNAL_REMARK,
+                    pp.PUBLIC_REPLY AS projectScheme
+                FROM project_staff ps
+                INNER JOIN project_process pp ON pp.PROJECT_ID = ps.PROJECT_ID AND pp.DEL_FLAG = '0'
+                WHERE ps.DEL_FLAG = '0'
+                    AND ps.ORG_ID_PATH LIKE CONCAT('%',#{agencyId})
+                    AND ps.STAFF_ID = #{userId}
+                ORDER BY pp.CREATED_TIME DESC) )t)t
             INNER JOIN project p ON p.ID = t.PROJECT_ID AND p.DEL_FLAG = '0'
             LEFT JOIN project_staff ps ON ps.PROJECT_ID = t.PROJECT_ID AND ps.DEL_FLAG = '0'
         WHERE 1=1