From 19c0886badef2cb971b8bfd3d5eadea3cbe74bc4 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Fri, 26 Jan 2024 18:00:23 +0800
Subject: [PATCH] 区域过滤去除上饶市
---
src/main/java/org/springblade/modules/article/mapper/ArticleMapper.xml | 71 +++++++++++++++++++++++++++++------
1 files changed, 59 insertions(+), 12 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 54b12d8..8ef1f6b 100644
--- a/src/main/java/org/springblade/modules/article/mapper/ArticleMapper.xml
+++ b/src/main/java/org/springblade/modules/article/mapper/ArticleMapper.xml
@@ -23,7 +23,7 @@
<result column="update_user" property="updateUser"/>
<result column="create_user" property="createUser"/>
<result column="is_deleted" property="isDeleted"/>
- <result property="articleRange" column="article_range" />
+ <result property="articleRange" column="article_range"/>
<collection property="countNumber" column="id" javaType="int" select="selectStlCount">
</collection>
@@ -38,7 +38,6 @@
and jnl.delete_flag = 0
and jn.id = #{id}
</select>
-
<sql id="selectArticle">
@@ -61,7 +60,9 @@
update_user,
create_user,
is_deleted,
- article_range
+ article_range,
+ building,
+ unit
from
jczz_article
</sql>
@@ -87,9 +88,9 @@
ja.update_user,
ja.create_user,
ja.is_deleted,
- jpd.id pdId,
- (select bdb.dict_value from blade_dict_biz bdb where bdb.parent_id='1722966265111248897' and ja.article_type = bdb.dict_key) dictValue,
- jpd.event_type
+ (select bdb.dict_value from blade_dict_biz bdb where bdb.parent_id='1740566650527752194' and ja.article_type
+ = bdb.dict_key) dictValue,
+ jpd.id pdId
from jczz_article ja
LEFT JOIN jczz_public_discuss jpd on jpd.article_id=ja.id
where ja.is_deleted = 0
@@ -101,9 +102,26 @@
and jpd.event_type = #{article.eventType}
</if>
+ <if test="article.type != null">
+ and ja.type = #{article.type}
+ </if>
+
+ <if test="article.type == null">
+ and ja.type = 0
+ </if>
+
<if test="article.districtId != null and article.districtId != ''">
and (ja.article_range like concat('%',#{article.districtId},'%')
or ja.article_range is null)
+ </if>
+ <if test="article.building != null and article.building != ''">
+ and (ja.building = #{article.building}
+ or ja.building is null)
+ </if>
+
+ <if test="article.unit != null and article.unit != ''">
+ and (ja.unit = #{article.unit}
+ or ja.unit is null)
</if>
</if>
<!-- 查询文章 -->
@@ -134,9 +152,27 @@
and ja.article_type = #{article.articleType}
</if>
+ <if test="article.type != null">
+ and ja.type = #{article.type}
+ </if>
+
+ <if test="article.type == null">
+ and ja.type = 0
+ </if>
+
<if test="article.districtId != null and article.districtId != ''">
- and ja.article_range like concat('%',#{article.districtId},'%')
- or ja.article_range is null
+ and (ja.article_range like concat('%',#{article.districtId},'%')
+ or ja.article_range is null)
+ </if>
+
+ <if test="article.building != null and article.building != ''">
+ and (ja.building = #{article.building}
+ or ja.building is null)
+ </if>
+
+ <if test="article.unit != null and article.unit != ''">
+ and (ja.unit = #{article.unit}
+ or ja.unit is null)
</if>
</if>
@@ -147,6 +183,7 @@
<select id="selectArticlePage" resultType="org.springblade.modules.article.entity.Article">
select * from jczz_article
where 1=1
+ and is_deleted = 0
<if test="article.title!=null and article.title!=''">
and title like concat('%',#{article.title},'%')
</if>
@@ -165,12 +202,22 @@
<if test="article.articleType!=null and article.articleType!=''">
and article_type like concat('%',#{article.articleType},'%')
</if>
+ <if test="article.type != null ">and type = #{article.type}</if>
+
<if test="article.keyword!=null and article.keyword!=''">
AND CONCAT(title,source_name)
LIKE CONCAT ('%', #{article.keyword},'%')
</if>
-
- and is_deleted = 0
+ <if test="article.districtIdList != null and article.districtIdList.size() > 0 ">
+ and (article_range like
+ <foreach collection="article.districtIdList" separator=" or article_range like" item="id">'%${id}%'
+ </foreach>
+ )
+ and district_id in
+ <foreach collection="article.districtIdList" index="index" item="item" open="(" separator="," close=")">
+ #{item}
+ </foreach>
+ </if>
order by id desc
</select>
@@ -227,7 +274,7 @@
sys_collect col
LEFT JOIN jczz_article art on art.id = col.collect_article
WHERE
- 1 = 1 AND collect_user = #{article.userid}
+ 1 = 1 AND collect_user = #{article.userid}
<if test="article.articleType!=null and article.articleType!=''">
and article_type LIKE CONCAT ('%', #{article.articleType},'%')
</if>
@@ -427,7 +474,7 @@
ja.create_user,
ja.is_deleted,
ja.article_range,
- ((select bdb.dict_value from blade_dict_biz bdb where bdb.parent_id='1722966265111248897' and ja.article_type
+ ((select bdb.dict_value from blade_dict_biz bdb where bdb.parent_id=#{parentId} and ja.article_type
= bdb.dict_key)) dictValue
from jczz_article ja
<where>
--
Gitblit v1.9.3