From 4de26b24a5abe46b8593cdcac362594e94b0e71b Mon Sep 17 00:00:00 2001
From: luyan <xgktv007@163.com>
Date: Fri, 2 Jun 2023 19:53:38 +0800
Subject: [PATCH] =?UTF-8?q?=E7=81=B5=E5=B1=B1=E9=A1=B9=E7=9B=AE=EF=BC=9A?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=82=E6=95=B0=E5=88=A4=E6=96=AD=E9=94=99?=
 =?UTF-8?q?=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/IcEventDao.xml             | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/IcEventDao.xml b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/IcEventDao.xml
index 7f29766d85..e2acc4c1a8 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/IcEventDao.xml
+++ b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/IcEventDao.xml
@@ -686,14 +686,17 @@
         SELECT
             <include refid="eventArguments"/>
         FROM ic_event e
-        LEFT JOIN ic_event_reply r ON r.IC_EVENT_ID = e.ID AND r.FROM_USER_ID = #{staffId}
+        LEFT JOIN ic_event_reply r ON r.IC_EVENT_ID = e.ID
+         <if test="null != staffId and staffId != ''">
+             AND r.FROM_USER_ID = #{staffId}
+         </if>
         LEFT JOIN ic_event_category c ON c.IC_EVENT_ID = e.ID
         <where>
             e.DEL_FLAG = 0
-            <if test="replyStatus == '0'">
+            <if test="replyStatus == 0">
                 AND (e.REPLY_STATUS = 0 OR e.REPLY_STATUS = 1 OR e.REPLY_STATUS IS NULL)
             </if>
-            <if test="replyStatus == '1'">
+            <if test="replyStatus == 1">
                 AND (e.REPLY_STATUS = 2 OR e.REPLY_STATUS = 3 OR e.REPLY_STATUS = 4 OR e.REPLY_STATUS = 5)
             </if>
         </where>