From f9e2c3d6b10d799cd9630b43ad0b3ec5f9485b3d Mon Sep 17 00:00:00 2001
From: PushM <584406942@qq.com>
Date: Thu, 20 Jun 2024 02:12:41 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E7=99=BD=E5=90=8D=E5=8D=95=E3=80=81?=
 =?UTF-8?q?=E9=98=B2=E6=8A=A4=E5=AF=B9=E8=B1=A1=E6=96=87=E4=BB=B6=E5=AF=BC?=
 =?UTF-8?q?=E5=85=A5=E9=83=A8=E5=88=86=E5=B1=9E=E6=80=A7=E6=B2=A1=E6=9C=89?=
 =?UTF-8?q?=E5=BF=BD=E7=95=A5=202=E3=80=81=E7=99=BD=E5=90=8D=E5=8D=95?=
 =?UTF-8?q?=E5=8C=B9=E9=85=8Dsql=E9=94=99=E8=AF=AFbug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/mappers/WhiteListMapper.xml | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/main/resources/mappers/WhiteListMapper.xml b/src/main/resources/mappers/WhiteListMapper.xml
index 2e62eda..557e773 100644
--- a/src/main/resources/mappers/WhiteListMapper.xml
+++ b/src/main/resources/mappers/WhiteListMapper.xml
@@ -424,9 +424,9 @@
         from t_white_list
         <where>
             <foreach collection="taskCommandInfos" item="command" open="(" separator=" or " close=")">
-
+                false
                 <if test="command.fiveTupleWithMask.sourceIP != null and command.fiveTupleWithMask.maskSourceIP == null">
-                    (white_list_ip = INET_ATON(#{command.fiveTupleWithMask.sourceIP})
+                    or (white_list_ip = INET_ATON(#{command.fiveTupleWithMask.sourceIP})
                     <if test="command.fiveTupleWithMask.sourcePort != null">
                         and white_list_port = CAST(#{command.fiveTupleWithMask.sourcePort} AS UNSIGNED)
                     </if>
@@ -436,7 +436,7 @@
              )
                 </if>
                 <if test="command.fiveTupleWithMask.sourceIP != null and command.fiveTupleWithMask.maskSourceIP != null">
-                    (( white_list_ip &amp; INET_ATON(#{command.fiveTupleWithMask.maskSourceIP})) =
+                    or (( white_list_ip &amp; INET_ATON(#{command.fiveTupleWithMask.maskSourceIP})) =
                     (INET_ATON(#{command.fiveTupleWithMask.sourceIP}) &amp; INET_ATON(#{command.fiveTupleWithMask.maskSourceIP}))
                     <if test="command.fiveTupleWithMask.sourcePort != null">
                         and white_list_port = CAST(#{command.fiveTupleWithMask.sourcePort} AS UNSIGNED)
@@ -479,9 +479,11 @@
         select *, INET_NTOA(white_list_ip) as white_list_ip_d
         from t_white_list
         <where>
+
             <foreach collection="staticRuleObjects" item="staticRule" open="(" separator=" or " close=")">
+                false
                 <if test="staticRule.staticRuleSip != null and staticRule.staticRuleMsip == null">
-                    (white_list_ip = INET_ATON(#{staticRule.staticRuleSip})
+                    or(white_list_ip = INET_ATON(#{staticRule.staticRuleSip})
                     <if test="staticRule.staticRuleSport != null">
                         and white_list_port = #{staticRule.staticRuleSport}
                     </if>
@@ -491,7 +493,7 @@
                     )
                 </if>
                 <if test="staticRule.staticRuleSip != null and staticRule.staticRuleMsip != null">
-                    (( white_list_ip &amp; INET_ATON(#{staticRule.staticRuleSip})) =
+                    or(( white_list_ip &amp; INET_ATON(#{staticRule.staticRuleSip})) =
                     (INET_ATON(#{staticRule.staticRuleSip}) &amp; INET_ATON(#{staticRule.staticRuleMsip}))
                     <if test="staticRule.staticRuleSport != null">
                         and white_list_port = #{staticRule.staticRuleSport}