From 7ffe7b1791adfc27f4411c7ad0bea229f6799445 Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Mon, 04 Mar 2024 12:00:13 +0800
Subject: [PATCH] bug修复

---
 src/main/java/org/springblade/modules/article/mapper/ArticleMapper.xml |   76 ++++++++++++++++++--------------------
 1 files changed, 36 insertions(+), 40 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 be346dd..e67e886 100644
--- a/src/main/java/org/springblade/modules/article/mapper/ArticleMapper.xml
+++ b/src/main/java/org/springblade/modules/article/mapper/ArticleMapper.xml
@@ -41,30 +41,28 @@
 
 
     <sql id="selectArticle">
-        select
-            id,
-            title,
-            type,
-            content,
-            url,
-            video_url,
-            source_id,
-            source_name,
-            article_type,
-            recommend,
-            publish,
-            iscomment,
-            view_number,
-            create_time,
-            update_time,
-            update_user,
-            create_user,
-            is_deleted,
-            article_range,
-            building,
-            unit
-        from
-            jczz_article
+        select id,
+               title,
+               type,
+               content,
+               url,
+               video_url,
+               source_id,
+               source_name,
+               article_type,
+               recommend,
+               publish,
+               iscomment,
+               view_number,
+               create_time,
+               update_time,
+               update_user,
+               create_user,
+               is_deleted,
+               article_range,
+               building,
+               unit
+        from jczz_article
     </sql>
 
 
@@ -113,12 +111,12 @@
 
             <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  = '')
+                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  = '')
+                OR jpd.user_ids IS NULL or jpd.user_ids = '')
             </if>
 
             <if test="article.building != null and article.building != ''">
@@ -198,16 +196,13 @@
         LEFT JOIN blade_region br on br.`code` = jd.community_code
         where 1=1
         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 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 test="article.title!=null and article.title!=''">
             and ja.title like concat('%',#{article.title},'%')
@@ -238,10 +233,10 @@
             <foreach collection="article.districtIdList" separator=" or article_range like" item="id">'%${id}%'
             </foreach>
             )
-<!--            and ja.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 ja.create_time desc
     </select>
@@ -444,8 +439,9 @@
     </select>
 
     <update id="upcomment">
-        update jczz_article set iscomment = #{type}
-        where id in(${ids})
+        update jczz_article
+        set iscomment = #{type}
+        where id in (${ids})
     </update>
 
     <!--个人资讯-->

--
Gitblit v1.9.3