From f6eb2f990193c0c58b6bd3dd1e444cf11b35ebc1 Mon Sep 17 00:00:00 2001
From: 13036795865 <zhangmu19921206@111>
Date: Tue, 13 May 2025 11:14:38 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A6=82=E6=9E=9C=E7=99=BB=E5=BD=95=E4=BA=BA?=
 =?UTF-8?q?=E4=B8=BA=E7=A9=BA=E8=8E=B7=E5=8F=96=E5=AF=B9=E5=BA=94=E8=B4=9F?=
 =?UTF-8?q?=E8=B4=A3=E4=BA=BA=E7=9A=84=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/mapper/dms/AchievementsMapper.xml | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/microservices-modules/microservices-modules-dms/src/main/resources/mapper/dms/AchievementsMapper.xml b/microservices-modules/microservices-modules-dms/src/main/resources/mapper/dms/AchievementsMapper.xml
index eed37323c..c4933a155 100644
--- a/microservices-modules/microservices-modules-dms/src/main/resources/mapper/dms/AchievementsMapper.xml
+++ b/microservices-modules/microservices-modules-dms/src/main/resources/mapper/dms/AchievementsMapper.xml
@@ -251,7 +251,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectAchievementsByParam" parameterType="com.microservices.dms.achievementLibrary.domain.AchQueryVo" resultType="com.microservices.dms.achievementLibrary.domain.Achievements">
         <if test="source == ''  or source == null">
             select  a.id, a.achievement_name,a.summary,a.create_time,a.owner_name,a.tags,a.field_1,a.field_2,a.field_3,a.source,a.source_id,
-                    u.login as "userLogin",u.nickname as "userNickName",ue.gender as "gender",
+                    u.login as "userLogin",
+                   IFNULL(u.nickname,a.owner_name) as "userNickName",
+                    ue.gender as "gender",
             (select IFNULL(count(*), 0) from favorites where favorite_type = 'Achievements' and favorite_id = id)  as watcherSum,
             (select IFNULL(count(*), 0) from watchers where watchable_type = 'Achievements' and watchable_id = id) as favoriteSum
             from achievements a
@@ -264,7 +266,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </if>
         <if test='source=="1"'>
             select a.id,  a.achievement_name, a.summary, a.create_time, a.owner_name, a.tags, a.field_1, a.field_2, a.field_3, a.source, a.source_id,
-                   c.name as "field1Name",u.login  as "userLogin",u.nickname as "userNickName",ue.gender as "gender",
+                   c.name as "field1Name",u.login  as "userLogin",
+                    IFNULL(u.nickname,a.owner_name) as "userNickName",
+                   ue.gender as "gender",
             (select IFNULL(count(*), 0) from favorites where favorite_type = 'Achievements' and favorite_id = a.id)  as watcherSum,
             (select IFNULL(count(*), 0) from watchers where watchable_type = 'Achievements' and watchable_id = a.id) as favoriteSum
             from achievements a
@@ -282,7 +286,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </if>
         <if test='source=="2" or source=="3" or source=="4" '>
             select a.id,  a.achievement_name, a.summary, a.create_time, a.owner_name, a.tags, a.field_1, a.field_2, a.field_3, a.source, a.source_id,
-                   c.name as "field1Name",u.login  as "userLogin",u.nickname as "userNickName",ue.gender as "gender",
+                   c.name as "field1Name",u.login  as "userLogin",
+                    IFNULL(u.nickname,a.owner_name) as "userNickName",
+                   ue.gender as "gender",
             (select IFNULL(count(*), 0) from favorites where favorite_type = 'Achievements' and favorite_id = a.id)  as watcherSum,
             (select IFNULL(count(*), 0) from watchers where watchable_type = 'Achievements' and watchable_id = a.id) as favoriteSum
             from achievements a