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/MallMemberMapper.xml |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/main/resources/mapper/modules/MallMemberMapper.xml b/src/main/resources/mapper/modules/MallMemberMapper.xml
index 769eebc..730ace8 100644
--- a/src/main/resources/mapper/modules/MallMemberMapper.xml
+++ b/src/main/resources/mapper/modules/MallMemberMapper.xml
@@ -190,7 +190,7 @@
 
     <select id="getAgentListInPage" resultType="cc.mrbird.febs.mall.vo.AdminAgentVo">
 
-        SELECT m.*,a.description levelName,
+        SELECT m.*,a.name levelName,
         ifnull((
         SELECT
         sum(b.amount)
@@ -204,8 +204,9 @@
         or find_in_set(m.invite_id, e.referrer_ids)
         ),0) amount
         FROM mall_member m
-        left join data_dictionary_custom a on a.code = m.level
+        left join happy_sale_level a on a.code = m.store_master
         <where>
+             and m.store_master != 0
             <if test="record != null" >
                 <if test="record.name!=null and record.name!=''">
                     and m.name like concat('%',  #{record.name},'%')
@@ -252,8 +253,8 @@
     </select>
 
     <select id="getAgentChildInPage" resultType="cc.mrbird.febs.mall.vo.AdminAgentMemberVo">
-        select m.*,a.description levelName from mall_member m
-            left join data_dictionary_custom a on a.code = m.level
+        select m.*,a.name levelName from mall_member m
+            left join happy_sale_level a on a.code = m.store_master
         where  find_in_set(#{record.inviteId}, m.referrer_ids)
         GROUP BY m.id
         ORDER BY

--
Gitblit v1.9.1