From 00cd63c23181999ac00b8ca81aa3b9d0a4a0c146 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=B8=B8=E8=83=9C=E6=8C=AF?= <449117895@qq.com>
Date: Sun, 14 Jul 2024 19:47:48 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../hiatmp/server_api/controller/HighDangerController.java   | 4 ++--
 .../src/main/resources/sql-mapper/HighDangerMapper.xml       | 5 ++++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/controller/HighDangerController.java b/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/controller/HighDangerController.java
index 2cf8751..453d016 100644
--- a/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/controller/HighDangerController.java
+++ b/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/controller/HighDangerController.java
@@ -72,10 +72,10 @@ public class HighDangerController {
         List<HighDangerBase> statusCounts = highDangerMapper.getHigDangerDealt(highDangerBaseVO.getStatus(),cdepartmentid,page,"%" + search + "%");
 
         // 待办
-        if("20".equals(highDangerBaseVO.getStatus())){
+        /*if("20".equals(highDangerBaseVO.getStatus())){
             List<HighDangerBase> statusCount = highDangerMapper.getHigDangerDealt("99",cdepartmentid,page,"%" + search + "%");
             statusCounts.addAll(statusCount);
-        }
+        }*/
 
         for (HighDangerBase base : statusCounts) {
             Date nowDate = new Date();
diff --git a/hiatmp-hidden-danger-server/src/main/resources/sql-mapper/HighDangerMapper.xml b/hiatmp-hidden-danger-server/src/main/resources/sql-mapper/HighDangerMapper.xml
index 5221800..95b43e8 100644
--- a/hiatmp-hidden-danger-server/src/main/resources/sql-mapper/HighDangerMapper.xml
+++ b/hiatmp-hidden-danger-server/src/main/resources/sql-mapper/HighDangerMapper.xml
@@ -122,7 +122,10 @@
         LEFT JOIN enum_type et ON et.ENUMTYPEID = '6601'
         AND et.enumvalue = hdb.status
         WHERE hdb.handle_dept = #{cdepartmentid}
-        <if test="status != null and status != ''">
+        <if test="status != null and status != '' and status == '0'">
+            AND hdb.status (0,99)
+        </if>
+        <if test="status != null and status != ''  and status == '0'">
             AND hdb.status = #{status}
         </if>
         AND hdb.name like #{search}