From f4d0293731de259c800741e7cf3349c018f1f132 Mon Sep 17 00:00:00 2001
From: woody <woody@gmail.com>
Date: Wed, 23 Apr 2025 10:25:41 +0800
Subject: [PATCH] =?UTF-8?q?fix(BdNoticeMapper):=20=E5=85=AC=E5=91=8A?=
 =?UTF-8?q?=E5=BC=B9=E7=AA=97=E6=9F=A5=E8=AF=A2=E9=80=BB=E8=BE=91=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/system/base/BdNoticeMapper.xml       | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/hzs-business/hzs-business-system/src/main/resources/mapper/system/base/BdNoticeMapper.xml b/hzs-business/hzs-business-system/src/main/resources/mapper/system/base/BdNoticeMapper.xml
index 64c05282..02b6c944 100644
--- a/hzs-business/hzs-business-system/src/main/resources/mapper/system/base/BdNoticeMapper.xml
+++ b/hzs-business/hzs-business-system/src/main/resources/mapper/system/base/BdNoticeMapper.xml
@@ -246,11 +246,18 @@
         and n.website_type = #{websiteType}
         and sysdate >= n.start_time
         and sysdate &lt;= n.end_time
-        <if test="grade != null and grade != ''">
-            and instr(',' || n.grade || ',', ',' || #{grade} || ',') > 0
-        </if>
-        <if test="awards != null and awards != ''">
-            and instr(',' || n.awards || ',', ',' || #{awards} || ',') > 0
+        <if test="(grade != null and grade != '') or (awards != null and awards != '')">
+            and (
+                <if test="grade != null and grade != ''">
+                    instr(',' || n.grade || ',', ',' || #{grade} || ',') > 0
+                </if>
+                <if test="(grade != null and grade != '') and (awards != null and awards != '')">
+                    or
+                </if>
+                <if test="awards != null and awards != ''">
+                    instr(',' || n.awards || ',', ',' || #{awards} || ',') > 0
+                </if>
+            )
         </if>
         <if test="systemTypeList != null and systemTypeList.size > 0">
             and n.system_type in