From 3501ca8469b1a09f22cf0d3dbbe1adf331ea814a Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Tue, 27 Feb 2024 17:35:23 +0800
Subject: [PATCH] 圈子敏感信息校验
---
src/main/java/org/springblade/modules/article/mapper/ArticleMapper.xml | 124 +++++++++++++++++++++++++++++++++++------
1 files changed, 106 insertions(+), 18 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 8ef1f6b..be346dd 100644
--- a/src/main/java/org/springblade/modules/article/mapper/ArticleMapper.xml
+++ b/src/main/java/org/springblade/modules/article/mapper/ArticleMapper.xml
@@ -98,6 +98,7 @@
<if test="article.articleType != null and article.articleType != ''">
and ja.article_type = #{article.articleType}
</if>
+
<if test="article.eventType != null">
and jpd.event_type = #{article.eventType}
</if>
@@ -112,8 +113,14 @@
<if test="article.districtId != null and article.districtId != ''">
and (ja.article_range like concat('%',#{article.districtId},'%')
- or ja.article_range is null)
+ or ja.article_range is null or ja.article_range = '')
</if>
+
+ <if test="article.userId != null">
+ and (jpd.user_ids like concat('%',#{article.userId},'%')
+ OR jpd.user_ids IS NULL or jpd.user_ids = '')
+ </if>
+
<if test="article.building != null and article.building != ''">
and (ja.building = #{article.building}
or ja.building is null)
@@ -180,45 +187,63 @@
</select>
<!--查询资讯分页列表信息-->
- <select id="selectArticlePage" resultType="org.springblade.modules.article.entity.Article">
- select * from jczz_article
+ <select id="selectArticlePage" resultType="org.springblade.modules.article.vo.ArticleVO">
+ SELECT
+ ja.*,
+ br.`village_name` communityName,
+ br.town_name streetName
+ FROM
+ jczz_article ja
+ LEFT JOIN jczz_district jd ON ja.district_id = jd.id
+ LEFT JOIN blade_region br on br.`code` = jd.community_code
where 1=1
- and is_deleted = 0
+ and ja.is_deleted = 0
+ <if test="article.propertyFlag!=null ">
+ <if test="article.communityName!=null and article.communityName!=''">
+ and br.`village_name` like concat('%',#{article.communityName},'%')
+ </if>
+
+ <if test="article.streetName!=null and article.streetName!=''">
+ and br.town_name like concat('%',#{article.streetName},'%')
+ </if>
+ </if>
+
+
<if test="article.title!=null and article.title!=''">
- and title like concat('%',#{article.title},'%')
+ and ja.title like concat('%',#{article.title},'%')
</if>
<if test="article.sourceName!=null and article.sourceName!=''">
- and source_name like concat('%',#{article.sourceName},'%')
+ and ja.source_name like concat('%',#{article.sourceName},'%')
</if>
<if test="article.startTime!=null and article.startTime!=''">
- and create_time>=#{article.startTime}
+ and ja.create_time>=#{article.startTime}
</if>
<if test="article.endTime!=null and article.endTime!=''">
- and create_time<=#{article.endTime}
+ and ja.create_time<=#{article.endTime}
</if>
<if test="article.publish!=null and article.publish!=''">
- and publish = #{article.publish}
+ and ja.publish = #{article.publish}
</if>
<if test="article.articleType!=null and article.articleType!=''">
- and article_type like concat('%',#{article.articleType},'%')
+ and ja.article_type like concat('%',#{article.articleType},'%')
</if>
- <if test="article.type != null ">and type = #{article.type}</if>
+ <if test="article.type != null ">and ja.type = #{article.type}</if>
<if test="article.keyword!=null and article.keyword!=''">
- AND CONCAT(title,source_name)
+ AND CONCAT(ja.title,ja.source_name)
LIKE CONCAT ('%', #{article.keyword},'%')
</if>
<if test="article.districtIdList != null and article.districtIdList.size() > 0 ">
- and (article_range like
+ and (ja.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>
+<!-- and ja.district_id in-->
+<!-- <foreach collection="article.districtIdList" index="index" item="item" open="(" separator="," close=")">-->
+<!-- #{item}-->
+<!-- </foreach>-->
</if>
- order by id desc
+ order by ja.create_time desc
</select>
<!--查询资讯敏感词预警-->
@@ -510,4 +535,67 @@
WHERE jda.address_code = #{houseCode}
</select>
+ <select id="getArticleByDistrictId" resultType="org.springblade.modules.article.vo.ArticleVO"
+ parameterType="org.springblade.modules.article.vo.ArticleVO">
+ SELECT
+ ja.*,
+ br.`village_name` communityName,
+ br.town_name streetName
+ FROM
+ jczz_article ja
+ LEFT JOIN jczz_district jd ON ja.district_id = jd.id
+ LEFT JOIN blade_region br on br.`code` = jd.community_code
+ LEFT JOIN jczz_public_discuss jpd on jpd.article_id=ja.id
+ where 1=1
+ and ja.is_deleted = 0
+
+ <if test="article.eventType != null">
+ and jpd.event_type = #{article.eventType}
+ and jpd.end_time is not null
+ and jpd.end_time <= SYSDATE()
+ </if>
+
+ <if test="article.propertyFlag!=null ">
+ <if test="article.communityName!=null and article.communityName!=''">
+ and br.`village_name` like concat('%',#{article.communityName},'%')
+ </if>
+
+ <if test="article.streetName!=null and article.streetName!=''">
+ and br.town_name like concat('%',#{article.streetName},'%')
+ </if>
+ </if>
+
+ <if test="article.title!=null and article.title!=''">
+ and ja.title like concat('%',#{article.title},'%')
+ </if>
+ <if test="article.sourceName!=null and article.sourceName!=''">
+ and ja.source_name like concat('%',#{article.sourceName},'%')
+ </if>
+ <if test="article.startTime!=null and article.startTime!=''">
+ and ja.create_time>=#{article.startTime}
+ </if>
+ <if test="article.endTime!=null and article.endTime!=''">
+ and ja.create_time<=#{article.endTime}
+ </if>
+ <if test="article.publish!=null and article.publish!=''">
+ and ja.publish = #{article.publish}
+ </if>
+ <if test="article.articleType!=null and article.articleType!=''">
+ and ja.article_type like concat('%',#{article.articleType},'%')
+ </if>
+ <if test="article.type != null ">and ja.type = #{article.type}</if>
+
+ <if test="article.keyword!=null and article.keyword!=''">
+ AND CONCAT(ja.title,ja.source_name)
+ LIKE CONCAT ('%', #{article.keyword},'%')
+ </if>
+ <if test="article.districtIdList != null and article.districtIdList.size() > 0 ">
+ and (ja.article_range like
+ <foreach collection="article.districtIdList" separator=" or article_range like" item="id">'%${id}%'
+ </foreach>
+ )
+ </if>
+ order by ja.create_time desc
+
+ </select>
</mapper>
--
Gitblit v1.9.3