From efa8bdef79c195b01fe5532919e5e9a93d8bf2b2 Mon Sep 17 00:00:00 2001
From: 13036795865 <zhangmu19921206@111>
Date: Thu, 8 May 2025 17:28:14 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=93=E5=AE=B6=E6=80=A7=E5=88=AB=E4=BB=A5?=
 =?UTF-8?q?=E5=8F=8A=E9=BB=98=E8=AE=A4=E5=9B=BE=E7=89=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../domain/ExpertResourceLibrary.java         | 19 +++++++++++++++++++
 .../ExpertResourceLibraryServiceImpl.java     | 12 +++++++++++-
 .../dms/ExpertResourceLibraryMapper.xml       |  8 +++++---
 3 files changed, 35 insertions(+), 4 deletions(-)

diff --git a/microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/resourceLibrary/domain/ExpertResourceLibrary.java b/microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/resourceLibrary/domain/ExpertResourceLibrary.java
index 997c544d5..50186b9d3 100644
--- a/microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/resourceLibrary/domain/ExpertResourceLibrary.java
+++ b/microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/resourceLibrary/domain/ExpertResourceLibrary.java
@@ -74,6 +74,25 @@ public class ExpertResourceLibrary extends BaseEntity {
     private Long watcherSum;
     private Long favoriteSum;
 
+    private String userImg;
+    private String userNickName;
+
+    public String getUserImg() {
+        return userImg;
+    }
+
+    public void setUserImg(String userImg) {
+        this.userImg = userImg;
+    }
+
+    public String getUserNickName() {
+        return userNickName;
+    }
+
+    public void setUserNickName(String userNickName) {
+        this.userNickName = userNickName;
+    }
+
     public String getAreaQuery() {
         return areaQuery;
     }
diff --git a/microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/resourceLibrary/service/impl/ExpertResourceLibraryServiceImpl.java b/microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/resourceLibrary/service/impl/ExpertResourceLibraryServiceImpl.java
index d56d9f76d..1784b7ada 100644
--- a/microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/resourceLibrary/service/impl/ExpertResourceLibraryServiceImpl.java
+++ b/microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/resourceLibrary/service/impl/ExpertResourceLibraryServiceImpl.java
@@ -1,6 +1,7 @@
 package com.microservices.dms.resourceLibrary.service.impl;
 
 import com.microservices.common.core.utils.DateUtils;
+import com.microservices.common.core.utils.StringUtils;
 import com.microservices.dms.behaviorImage.domain.AchievementBehaviorSumVo;
 import com.microservices.dms.resourceLibrary.domain.ExpertResourceLibrary;
 import com.microservices.dms.resourceLibrary.domain.vo.ExpertAttachmentVo;
@@ -68,7 +69,16 @@ public class ExpertResourceLibraryServiceImpl implements IExpertResourceLibraryS
      */
     @Override
     public List<ExpertResourceLibrary> selectExpertResourceLibraryList(ExpertResourceLibrary expertResourceLibrary) {
-        return expertResourceLibraryMapper.selectExpertResourceLibraryList(expertResourceLibrary);
+        List<ExpertResourceLibrary>  expertResourceLibraryList = expertResourceLibraryMapper.selectExpertResourceLibraryList(expertResourceLibrary);
+        for (ExpertResourceLibrary a : expertResourceLibraryList) {
+            String gender = a.getGender();
+            String img = "images/avatars/User/boy.jpg";
+            if(StringUtils.isNotEmpty(gender) && gender.equals("1")){
+               img = "images/avatars/User/girl.jpg";
+            }
+            a.setUserImg(img);
+        }
+        return expertResourceLibraryList;
     }
 
 
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 006ae726e..30d8bad0b 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,8 @@
     <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,
-        e.id_number,erl.gender,images, attachments,
+        u.nickname as "userNickName",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,
         expert_domain,u.authentication as expertAuth,
@@ -83,11 +84,12 @@
         erl.update_by, erl.update_time,erl.sort_no
         from experts e
         inner join users u on e.user_id = u.id
+        inner join user_extensions ue on u.id = ue.user_id
         left join expert_resource_library erl on e.id = erl.expert_id
         <where>
             e.is_delete='0' and e.status=1
-            <if test="userId != null ">and user_id = #{userId}</if>
-            <if test="gender != null ">and gender = #{gender}</if>
+            <if test="userId != null ">and e.user_id = #{userId}</if>
+            <if test="gender != null ">and ue.gender = #{gender}</if>
             <if test="expertName != null  and expertName != ''">and e.expert_name like concat('%', #{expertName}, '%')
             </if>
             <if test="highestDegree != null  and highestDegree != ''">and highest_degree = #{highestDegree}</if>