From 87c0cb5ed6477f1760034bcf1de608102b29e442 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Mon, 29 Jan 2024 18:34:07 +0800
Subject: [PATCH] 九小场所检查

---
 src/main/java/org/springblade/modules/article/mapper/ArticleMapper.xml |   47 +++++++++++++++++++++++++++++++++--------------
 1 files changed, 33 insertions(+), 14 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..508f73e 100644
--- a/src/main/java/org/springblade/modules/article/mapper/ArticleMapper.xml
+++ b/src/main/java/org/springblade/modules/article/mapper/ArticleMapper.xml
@@ -180,45 +180,64 @@
     </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 ">
+            and ja.district_id IS NOT 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&gt;=#{article.startTime}
+            and ja.create_time&gt;=#{article.startTime}
         </if>
         <if test="article.endTime!=null and article.endTime!=''">
-            and create_time&lt;=#{article.endTime}
+            and ja.create_time&lt;=#{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
+            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>
 
     <!--查询资讯敏感词预警-->

--
Gitblit v1.9.3