From bd49e7233075902203f322a38fe327c8cf1fd8dd 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 20:02:18 +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

---
 .../server_api/controller/HighDangerController.java    |  2 +-
 .../src/main/resources/sql-mapper/HighDangerMapper.xml | 10 ++++++----
 2 files changed, 7 insertions(+), 5 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 453d016..705b456 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
@@ -69,7 +69,7 @@ public class HighDangerController {
         Page<HighDangerBase> page = new Page<>(pageNum, pageSize);
 
         // 将要查询的状态和部门id查询数据库，获得隐患排查表
-        List<HighDangerBase> statusCounts = highDangerMapper.getHigDangerDealt(highDangerBaseVO.getStatus(),cdepartmentid,page,"%" + search + "%");
+        List<HighDangerBase> statusCounts = highDangerMapper.getHigDangerDealt(highDangerBaseVO.getStatus(),cdepartmentid,page,search);
 
         // 待办
         /*if("20".equals(highDangerBaseVO.getStatus())){
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 95b43e8..df566f1 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,13 +122,15 @@
         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 != '' and status == '0'">
-            AND hdb.status (0,99)
+        <if test="status != null and status == 0">
+            AND hdb.status in ('0','99')
         </if>
-        <if test="status != null and status != ''  and status == '0'">
+        <if test="status != null and status != 0">
             AND hdb.status = #{status}
         </if>
-        AND hdb.name like #{search}
+        <if test="search != null and search != ''">
+            AND hdb.name like concat(concat('%',#{search}),'%')
+        </if>
         -- ORDER BY hdb.PC_END_TIME::timestamp DESC
         ORDER BY
         CASE