From ea806c12de1e9760fc71d53e3a456b6137822845 Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Sat, 13 Apr 2024 14:29:26 +0800
Subject: [PATCH] 轮播图过滤

---
 src/main/java/org/springblade/modules/rotation/mapper/RotationMapper.xml |   13 +++++++++----
 1 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/main/java/org/springblade/modules/rotation/mapper/RotationMapper.xml b/src/main/java/org/springblade/modules/rotation/mapper/RotationMapper.xml
index f9ebd11..8aeaf17 100644
--- a/src/main/java/org/springblade/modules/rotation/mapper/RotationMapper.xml
+++ b/src/main/java/org/springblade/modules/rotation/mapper/RotationMapper.xml
@@ -39,15 +39,17 @@
             and jr.community_code like concat('%',#{rotation.regionCode},'%')
         </if>
 
-        <if test="rotation.rotationRange != null  and rotation.rotationRange != ''"> and jr.rotation_range = #{rotation.rotationRange}</if>
-        <if test="rotation.articleId != null "> and jr.article_id = #{rotation.articleId}</if>
-        <if test="rotation.publicFlag != null "> and jr.public_flag = #{rotation.publicFlag}</if>
+        <if test="rotation.rotationRange != null  and rotation.rotationRange != ''">and jr.rotation_range =
+            #{rotation.rotationRange}
+        </if>
+        <if test="rotation.articleId != null ">and jr.article_id = #{rotation.articleId}</if>
+        <if test="rotation.publicFlag != null ">and jr.public_flag = #{rotation.publicFlag}</if>
 
         <if test="rotation.districtIdList != null and rotation.districtIdList.size() > 0 ">
             and (jr.rotation_range like
             <foreach collection="rotation.districtIdList" separator=" or jr.rotation_range like" item="id">'%${id}%'
             </foreach>
-            )
+            ) or jr.rotation_range is null
         </if>
 
         <if test="isAdministrator==2">
@@ -79,6 +81,9 @@
                     </if>
                     <if test="rotation.roleName=='inhabitant'">
                         and jr.type = 3
+                        <if test="rotation.districtIdList == null ">
+                            and jr.rotation_range is null
+                        </if>
                     </if>
                 </when>
                 <otherwise>

--
Gitblit v1.9.3