From e94cc70a74ad8c7e0d64e89d8a0adc1dfed00a57 Mon Sep 17 00:00:00 2001
From: PushM <584406942@qq.com>
Date: Thu, 9 May 2024 16:39:52 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E9=98=B2=E6=8A=A4=E5=AF=B9=E8=B1=A1?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E3=80=81=E7=99=BD=E5=90=8D=E5=8D=95=E6=96=B0?=
 =?UTF-8?q?=E5=BB=BAbug=E8=A7=A3=E5=86=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit 268f7654b1bdcdbff2d6f864c9ec7ea62a5e7666)
---
 .../resources/mappers/ProtectObjectMapper.xml    | 16 ++++++++--------
 src/main/resources/mappers/WhiteListMapper.xml   |  6 +++---
 .../server/whitelist/WhiteListServiceTest.java   |  6 ++++++
 3 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/src/main/resources/mappers/ProtectObjectMapper.xml b/src/main/resources/mappers/ProtectObjectMapper.xml
index a5abd44..3bceb89 100644
--- a/src/main/resources/mappers/ProtectObjectMapper.xml
+++ b/src/main/resources/mappers/ProtectObjectMapper.xml
@@ -55,24 +55,24 @@
                ,protect_object_display_id
         FROM t_protect_object
         <where>
-            <if test="proobj_name != null">AND protect_object_name LIKE CONCAT('%', #{proobj_name}, '%')</if>
+            <if test="proobj_name != null and proobj_name != '' ">AND protect_object_name LIKE CONCAT('%', #{proobj_name}, '%')</if>
             <if test="proobj_id != null">AND protect_object_id = #{proobj_id}</if>
-            <if test="proobj_system_name != null">
+            <if test="proobj_system_name != null and proobj_system_name != '' ">
                 AND protect_object_system_name LIKE CONCAT('%', #{proobj_system_name}, '%')
             </if>
-            <if test="proobj_ip != null">
+            <if test="proobj_ip != null and proobj_ip != '' ">
                 AND protect_object_id IN (
-                    SELECT protect_object_id FROM t_protect_object_inet_addr_view tpo_view
-                    WHERE tpo_view.protect_object_ip LIKE CONCAT('%', #{proobj_ip}, '%')
+                SELECT protect_object_id FROM t_protect_object_inet_addr_view tpo_view
+                WHERE tpo_view.protect_object_ip LIKE CONCAT('%', #{proobj_ip}, '%')
                 )
             </if>
             <if test="proobj_port_min != null">
-                AND protect_object_port &gt; #{proobj_port_min}
+                AND protect_object_port &gt;= #{proobj_port_min}
             </if>
             <if test="proobj_port_max != null">
-                AND protect_object_port &lt; #{proobj_port_max}
+                AND protect_object_port &lt;= #{proobj_port_max}
             </if>
-            <if test="proobj_url != null">
+            <if test="proobj_url != null and proobj_url != '' ">
                 AND protect_object_url LIKE CONCAT('%', #{proobj_url}, '%')
             </if>
             <if test="proobj_protocol != null">
diff --git a/src/main/resources/mappers/WhiteListMapper.xml b/src/main/resources/mappers/WhiteListMapper.xml
index d7fa742..fdad115 100644
--- a/src/main/resources/mappers/WhiteListMapper.xml
+++ b/src/main/resources/mappers/WhiteListMapper.xml
@@ -9,13 +9,13 @@
                                  white_list_ip, white_list_port,
                                  white_list_url, white_list_protocol,
                                  white_list_audit_status, create_time, white_list_display_id,
-                                 white_list_create_username, white_list_create_depart,
-                                 white_list_create_user_id)
+                                 create_username, create_user_department,
+                                 create_user_id)
         values (#{object.whiteListName}, #{object.whiteListSystemName},
                 INET_ATON(#{object.whiteListIP}), #{object.whiteListPort},
                 #{object.whiteListUrl}, #{object.whiteListProtocol},
                 0, NOW(), #{object.whiteListDisplayId},
-                #{object.createUsername}, #{object.createDepart},
+                #{object.createUserName}, #{object.createUserDepartment},
                 #{object.createUserId})
     </insert>
 
diff --git a/src/test/java/com/realtime/protection/server/whitelist/WhiteListServiceTest.java b/src/test/java/com/realtime/protection/server/whitelist/WhiteListServiceTest.java
index df46f7d..0cb512a 100644
--- a/src/test/java/com/realtime/protection/server/whitelist/WhiteListServiceTest.java
+++ b/src/test/java/com/realtime/protection/server/whitelist/WhiteListServiceTest.java
@@ -47,6 +47,12 @@ class WhiteListServiceTest extends ProtectionApplicationTests {
     void testNewWhiteList() {
         WhiteListObject object = new WhiteListObject();
         object.setWhiteListName("test");
+        object.setWhiteListSystemName("china");
+        object.setWhiteListIP("1.1.1.1");
+        object.setWhiteListPort(80);
+        object.setWhiteListUrl("www.baidu.com");
+        object.setWhiteListProtocol("TCP");
+
 
         Integer objectId = whiteListService.newWhiteListObject(object);
         assertTrue(objectId > 0);