From 5e3ccaf4e7348c486ae60a21ef290aa3613f8f2c Mon Sep 17 00:00:00 2001
From: 13036795865 <zhangmu19921206@111>
Date: Wed, 14 May 2025 20:50:26 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=93=E5=AE=B6=E6=80=A7=E5=88=AB=E8=8E=B7?=
 =?UTF-8?q?=E5=8F=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/dms/AchievementsMapper.xml | 3 +++
 .../resources/mapper/dms/ExpertResourceLibraryMapper.xml | 9 ++++++---
 2 files 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 bc175cc22..536c236a6 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
@@ -267,6 +267,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <where>
                 and a.status='1'
                 <if test="achievementName != null  and achievementName != ''"> and a.achievement_name like concat('%', #{achievementName}, '%')</if>
+                <if test="showAchievementName != null  and showAchievementName != ''"> and a.show_ach_name like concat('%', #{showAchievementName}, '%')</if>
             </where>
             order by a.create_time desc
         </if>
@@ -284,6 +285,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <where>
                 and a.status='1'
                 <if test="achievementName != null  and achievementName != ''"> and a.achievement_name like concat('%', #{achievementName}, '%')</if>
+                <if test="showAchievementName != null  and showAchievementName != ''"> and a.show_ach_name like concat('%', #{showAchievementName}, '%')</if>
                 <if test="source != null  and source != ''"> and a.source = #{source}</if>
                 <if test='areaQuery != null  and areaQuery != "" '>
                     and (a.field_1 = #{areaQuery} or a.field_2 = #{areaQuery} or a.field_3 = #{areaQuery})
@@ -305,6 +307,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <where>
                 and a.status='1'
                 <if test="achievementName != null  and achievementName != ''"> and a.achievement_name like concat('%', #{achievementName}, '%')</if>
+                <if test="showAchievementName != null  and showAchievementName != ''"> and a.show_ach_name like concat('%', #{showAchievementName}, '%')</if>
                 <if test="source != null  and source != ''"> and a.source = #{source}</if>
                 <if test='areaQuery != null  and areaQuery != "" '>
                     and (a.field_1 = #{areaQuery} or a.field_2 = #{areaQuery} or a.field_3 = #{areaQuery})
diff --git a/microservices-modules/microservices-modules-dms/src/main/resources/mapper/dms/ExpertResourceLibraryMapper.xml b/microservices-modules/microservices-modules-dms/src/main/resources/mapper/dms/ExpertResourceLibraryMapper.xml
index 32d1edcad..349af9267 100644
--- a/microservices-modules/microservices-modules-dms/src/main/resources/mapper/dms/ExpertResourceLibraryMapper.xml
+++ b/microservices-modules/microservices-modules-dms/src/main/resources/mapper/dms/ExpertResourceLibraryMapper.xml
@@ -72,7 +72,7 @@
     <select id="selectExpertResourceLibraryList" parameterType="ExpertResourceLibrary"
             resultType="com.microservices.dms.resourceLibrary.domain.ExpertResourceLibrary">
         select * from ( select erl.id, e.id as expert_id,e.user_id, e.expert_name, e.highest_degree, e.graduated_from,
-        u.nickname as "userNickName",ue.gender as "gender",
+        u.nickname as "userNickName", IFNULL(erl.gender, ue.gender) as "gender",
         e.id_number,images, attachments,
         e.major, e.workplace, e.phone,
         e.workplace_type, e.expert_email, erl.expert_summary, erl.expert_detail, e.professional_title, e.expert_type,
@@ -121,7 +121,7 @@
     <select id="selectExpertResourceLibraryList2" parameterType="ExpertResourceLibrary"
             resultMap="ExpertResourceLibraryResult">
         select erl.id, e.id as expert_id,e.user_id, e.expert_name, e.highest_degree, e.graduated_from, e.id_number,
-        e.major, e.workplace, e.phone,
+        e.major, e.workplace, e.phone,u.nickname as "userNickName", IFNULL(erl.gender, ue.gender) as "gender",
         e.workplace_type, e.expert_email, erl.expert_summary, erl.expert_detail, e.professional_title, e.expert_type,
         expert_domain,images, attachments,
         e.title_rank, erl.status, e.review_area_one, e.review_area_two, e.review_area_three, e.is_delete, erl.create_by,
@@ -131,7 +131,10 @@
         (select count(*) as watchSum from watchers where watchable_type = 'Experts' and watchable_id = erl.id) as watcherSum,
         (select count(*) as favoriteSum from favorites where favorite_type = 'Experts' and favorite_id = erl.id) as favoriteSum,
         erl.update_by, erl.update_time,erl.sort_no
-        from expert_resource_library erl left join experts e on e.id = erl.expert_id
+        from expert_resource_library erl
+        left join experts e on e.id = erl.expert_id
+        left join users u on e.user_id = u.id
+        left join user_extensions ue on u.id = ue.user_id
         <where>
             <if test="userId != null ">and user_id = #{userId}</if>
             <if test="expertName != null  and expertName != ''">and erl.expert_name like concat('%', #{expertName}, '%')