From 2bf87bc6a1da50b6359ea2b53cc4acb12bff2ab7 Mon Sep 17 00:00:00 2001
From: woody <woody@gmail.com>
Date: Mon, 19 May 2025 14:42:10 +0800
Subject: [PATCH] =?UTF-8?q?fix(cumemberService):=20=E5=AE=89=E7=BD=AE?=
 =?UTF-8?q?=E6=9E=B6=E6=9E=84=E6=96=B9=E6=A1=88=E4=BA=94=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E5=A5=96=E8=A1=94=E4=B8=8E=E7=AD=89=E7=BA=A7=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../hzs/member/base/service/impl/CuMemberServiceImpl.java | 3 +++
 .../mapper/member/achieve/CuMemberTreeMapper.xml          | 8 ++++++--
 .../hzs/common/domain/member/ext/CuMemberSettleExt.java   | 3 +++
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberServiceImpl.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberServiceImpl.java
index 3f6d57ef..ea041cbd 100644
--- a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberServiceImpl.java
+++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberServiceImpl.java
@@ -2113,7 +2113,10 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
                     tree.putExtra("memberCode", treeNode.getMemberCode());
                     tree.putExtra("placeDept", treeNode.getPlaceDept());
                     tree.putExtra("level", treeNode.getLevel());
+                    tree.putExtra("gradeName", treeNode.getGradeName());
+                    tree.putExtra("awardsName", treeNode.getAwardsName());
                     tree.putExtra("parentMemberCode", treeNode.getParentMemberCode());
+
                 });
         return build;
     }
diff --git a/bd-business/bd-business-member/src/main/resources/mapper/member/achieve/CuMemberTreeMapper.xml b/bd-business/bd-business-member/src/main/resources/mapper/member/achieve/CuMemberTreeMapper.xml
index c7641843..22b4e337 100644
--- a/bd-business/bd-business-member/src/main/resources/mapper/member/achieve/CuMemberTreeMapper.xml
+++ b/bd-business/bd-business-member/src/main/resources/mapper/member/achieve/CuMemberTreeMapper.xml
@@ -303,12 +303,14 @@
             t.MALL_PV ,t.MALL_NEW_PV,t.MIN_ACHIEVE,t.ROUND,t.SECOND, t.a_new_box, t.b_new_box, t.a_sum_box, t.b_sum_box ,
         </if>
         cm.PK_AWARDS,cm.PK_PLACE_PARENT,cm.PK_PARENT ,cm.PLACE_DEPT ,cm.MEMBER_NAME, cm.MEMBER_CODE,cm.PK_ID
-        PK_MEMBER,cm.PK_COUNTRY,cm.PK_SETTLE_COUNTRY,cme.MEMBER_CODE parentMemberCode,
+        PK_MEMBER,cm.PK_COUNTRY,cm.PK_SETTLE_COUNTRY,cme.MEMBER_CODE parentMemberCode, grade.GRADE_NAME, awards.AWARDS_NAME,
         (select count(cr.pk_id) from CU_MEMBER cr where cr.pk_parent = cm.pk_id and cr.del_flag = 0)
         directPushNumber,cm.PK_VERTEX ,cm.NICK_NAME
         from
         CU_MEMBER cm
         left join CU_MEMBER cme on cme.PK_ID = cm.PK_PLACE_PARENT
+        left join BD_GRADE grade on grade.PK_ID = cm.PK_SETTLE_GRADE
+        left join BD_AWARDS awards on awards.PK_ID = cm.PK_AWARDS
         <if test="tableName != null and tableName != ''">
             left join ${tableName} t on cm.PK_ID = t.PK_MEMBER
         </if>
@@ -465,9 +467,11 @@
     <select id="selectByTreeMemberListFive" resultMap="CuMemberSettleExt">
         select level,cm.PK_AWARDS,cm.PK_SETTLE_COUNTRY,
         cm.PK_PLACE_PARENT,cm.PK_PARENT ,cm.PLACE_DEPT ,cm.MEMBER_NAME, cm.MEMBER_CODE,cm.PK_ID
-        PK_MEMBER,cm.PK_COUNTRY,cme.MEMBER_CODE parentMemberCode
+        PK_MEMBER,cm.PK_COUNTRY,cme.MEMBER_CODE parentMemberCode, grade.GRADE_NAME gradeName, awards.AWARDS_NAME
         from CU_MEMBER cm
+        left join BD_GRADE grade on cm.PK_SETTLE_GRADE = grade.PK_ID
         left join CU_MEMBER cme on cme.PK_ID = cm.PK_PARENT
+        left join BD_AWARDS awards on cme.PK_AWARDS = awards.PK_ID
         where level &lt; #{level} and cm.del_flag = 0
         <!-- 体系权限处理 -->
         <if test="vertexIdList != null and vertexIdList.size > 0">
diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/ext/CuMemberSettleExt.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/ext/CuMemberSettleExt.java
index fd657918..ef5fd913 100644
--- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/ext/CuMemberSettleExt.java
+++ b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/ext/CuMemberSettleExt.java
@@ -25,6 +25,8 @@ public class CuMemberSettleExt extends CuMemberTree {
 
     private Integer gradeValue;
 
+    private String gradeName;
+
     /**
      * 原奖衔
      */
@@ -437,4 +439,5 @@ public class CuMemberSettleExt extends CuMemberTree {
      */
     private Integer awardsValue;
 
+    private String awardsName;
 }