From ccbd86bc5f747b748b5bde257a789d748b8cefbb Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Thu, 11 Sep 2025 17:41:35 +0800
Subject: [PATCH] ``` refactor(service): 在设置活动类别名称前增加非空检查在AdminHappyActivityServiceImpl.java中，对happyActivity的categoryId进行了非空检查，并且确认categoryMap中包含该categoryId后，再设置其categoryName。这样可以避免因为空值或不存在的键导致的潜在异常。 ```
---
src/main/resources/mapper/modules/HappySocialCircleMapper.xml | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/src/main/resources/mapper/modules/HappySocialCircleMapper.xml b/src/main/resources/mapper/modules/HappySocialCircleMapper.xml
index 255f655..25a0eaa 100644
--- a/src/main/resources/mapper/modules/HappySocialCircleMapper.xml
+++ b/src/main/resources/mapper/modules/HappySocialCircleMapper.xml
@@ -5,10 +5,16 @@
<select id="selectListInPage" resultType="cc.mrbird.febs.mall.vo.activity.ApiScInfoVo">
select
a.id,
+ a.is_normal,
+ a.finder_user_name,
+ a.feed_id,
b.avatar,
b.name as memberName,
a.name as name,
a.CREATED_TIME as createdTime,
+ (select count(*) from happy_follow where source_type = 2 and DELETE_FLAG = 0 and source_id = a.id and type = 1) as followCnt,
+ (select count(*) from happy_follow where source_type = 2 and DELETE_FLAG = 0 and source_id = a.id and type = 2) as zanCnt,
+ (select count(*) from happy_follow where source_type = 2 and DELETE_FLAG = 0 and source_id = a.id and type = 3) as sendCnt,
a.index_file as indexFile
from happy_social_circle a
left join mall_member b on a.member_id = b.id
@@ -16,7 +22,7 @@
a.state = 1
and a.DELETE_FLAG = 0
and a.category_id=#{record.categoryId}
- order by a.order_cnt asc
+ order by a.order_cnt asc, a.created_time desc
</select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.1