From 5ddf5e221d718bc253fb87b8092b7e2ff08788f5 Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Tue, 09 Apr 2024 16:31:19 +0800
Subject: [PATCH] 维修基金申请添加字段

---
 src/main/java/org/springblade/modules/article/mapper/ArticleMapper.xml |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/springblade/modules/article/mapper/ArticleMapper.xml b/src/main/java/org/springblade/modules/article/mapper/ArticleMapper.xml
index e67e886..c79a502 100644
--- a/src/main/java/org/springblade/modules/article/mapper/ArticleMapper.xml
+++ b/src/main/java/org/springblade/modules/article/mapper/ArticleMapper.xml
@@ -114,8 +114,12 @@
                 or ja.article_range is null or ja.article_range = '')
             </if>
 
-            <if test="article.userId != null">
-                and (jpd.user_ids like concat('%',#{article.userId},'%')
+            <if test="article.districtId == null ">
+                and ja.article_range is  null
+            </if>
+
+            <if test="article.householdId != null">
+                and (FIND_IN_SET ( #{article.householdId}, jpd.user_ids )
                 OR jpd.user_ids IS NULL or jpd.user_ids = '')
             </if>
 

--
Gitblit v1.9.3