From acb3762392bfab85249b13bf3eb1a4dd1affcf28 Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Fri, 01 Dec 2023 17:50:03 +0800
Subject: [PATCH] 圈子

---
 src/main/java/org/springblade/modules/circle/mapper/CircleMapper.xml |   28 ++++++++++++++++++----------
 1 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/src/main/java/org/springblade/modules/circle/mapper/CircleMapper.xml b/src/main/java/org/springblade/modules/circle/mapper/CircleMapper.xml
index 9f02f39..b852820 100644
--- a/src/main/java/org/springblade/modules/circle/mapper/CircleMapper.xml
+++ b/src/main/java/org/springblade/modules/circle/mapper/CircleMapper.xml
@@ -49,7 +49,7 @@
 
 
     <select id="selectCirclePage" resultMap="CircleVOResult">
-        select  jc.id,
+        select jc.id,
         jc.user_id,
         jc.create_time,
         jc.circle_text,
@@ -59,18 +59,26 @@
         bu.name,
         bu.avatar,
         jc.circle_type,
-        (select count(1) from jczz_circle_like jcl where jcl.circle_id = jc.id  and  jcl.user_id  = #{circle.userId}  ) likeFlag
+        (select count(1) from jczz_circle_like jcl where jcl.circle_id = jc.id and jcl.user_id = #{circle.userIds} and
+        jcl.delete_flag = 0 ) likeFlag
         from jczz_circle jc left join blade_user bu on jc.user_id = bu.id
         <where>
-            <if test="circle.id != null "> and id = #{circle.id}</if>
-            <if test="circle.userId != null "> and user_id = #{circle.userId}</if>
-            <if test="circle.createTime != null "> and create_time = #{circle.createTime}</if>
-            <if test="circle.circleText != null  and circle.circleText != ''"> and circle_text = #{circle.circleText}</if>
-            <if test="circle.circleImages != null  and circle.circleImages != ''"> and circle_images = #{circle.circleImages}</if>
-            <if test="circle.circleVideo != null  and circle.circleVideo != ''"> and circle_video = #{circle.circleVideo}</if>
-            <if test="circle.deletedFalg != null "> and deleted_falg = #{circle.deletedFalg}</if>
-            <if test="circle.circleType != null "> and circle_type = #{circle.circleType}</if>
+            <if test="circle.id != null ">and jc.id = #{circle.id}</if>
+            <if test="circle.userId != null ">and jc.user_id = #{circle.userId}</if>
+            <if test="circle.createTime != null ">and jc.create_time = #{circle.createTime}</if>
+            <if test="circle.circleText != null  and circle.circleText != ''">and jc.circle_text like concat
+                ('%',#{circle.circleText},'%')
+            </if>
+            <if test="circle.circleImages != null  and circle.circleImages != ''">and jc.circle_images =
+                #{circle.circleImages}
+            </if>
+            <if test="circle.circleVideo != null  and circle.circleVideo != ''">and jc.circle_video =
+                #{circle.circleVideo}
+            </if>
+            <if test="circle.deletedFalg != null ">and jc.deleted_falg = #{circle.deletedFalg}</if>
+            <if test="circle.circleType != null ">and jc.circle_type = #{circle.circleType}</if>
         </where>
+        order by jc.create_time desc
     </select>
 
 

--
Gitblit v1.9.3