From 92a2746df65e21c80f8ac866d7c394e37c51aff4 Mon Sep 17 00:00:00 2001
From: luyan <xgktv007@163.com>
Date: Wed, 24 May 2023 13:29:26 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=8B=E4=BB=B6=E5=88=86?=
 =?UTF-8?q?=E6=9E=90=E7=BB=9F=E8=AE=A1=E6=96=B9=E5=BC=8F=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/IcEventDao.xml         | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 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 85113ec1a4..8a93f11709 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
@@ -546,9 +546,12 @@
         FROM
             ic_event_reply r
         <where>
-            r.DEL_FLAG = 0 AND r.MANAGE_STATUS = #{manageType}
-            <if test="null != manageType and manageType != '' and manageType == 2">
-                OR r.MANAGE_STATUS = 3 OR r.MANAGE_STATUS = 4
+            r.DEL_FLAG = 0
+            <if test="null != manageType and manageType != '' and manageType != '2'">
+                AND r.MANAGE_STATUS = #{manageType}
+            </if>
+            <if test="null != manageType and manageType != '' and manageType == '2'">
+                AND (r.MANAGE_STATUS = #{manageType} OR r.MANAGE_STATUS = 3 OR r.MANAGE_STATUS = 4)
             </if>
             AND r.IC_EVENT_ID IN (
                 SELECT e.id from ic_event e
@@ -561,6 +564,7 @@
                         AND e.GRID_PIDS LIKE concat(#{orgIdPath},'%')
                     </if>
                 </where>
+                group by e.id
             )
         </where>
     </select>
@@ -679,7 +683,7 @@
                 SELECT count( r.id ) AS total FROM ic_event_reply r
                 <where>
                     r.DEL_FLAG = 0
-                    AND r.MANAGE_STATUS = 2 OR r.MANAGE_STATUS = 3 OR r.MANAGE_STATUS = 4 OR r.MANAGE_STATUS = 5
+                    AND r.MANAGE_STATUS = 2 OR r.MANAGE_STATUS = 3 OR r.MANAGE_STATUS = 4
                     AND r.IC_EVENT_ID IN (
                         SELECT e.id AS id FROM ic_event e
                         <where>