From 677fb671bbfebabdf3e28d2d026b466c799f8f50 Mon Sep 17 00:00:00 2001
From: liuhuazhong <admin@xx.com>
Date: Fri, 9 May 2025 16:54:21 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E3=80=90=E8=B5=84=E6=BA=90=E5=BA=93-?=
 =?UTF-8?q?=E6=A0=A1=E4=BC=81=E6=88=90=E6=9E=9C=E3=80=91=E9=9C=80=E8=A6=81?=
 =?UTF-8?q?=E8=AE=B0=E5=BD=95=E5=88=9B=E5=BB=BA=E4=BA=BA=EF=BC=8C=E6=A0=A1?=
 =?UTF-8?q?=E4=BC=81=E6=88=90=E6=9E=9C=E5=88=97=E8=A1=A8=E4=BB=85=E5=B1=95?=
 =?UTF-8?q?=E7=A4=BA=E5=BD=93=E5=89=8D=E7=94=A8=E6=88=B7=E5=88=9B=E5=BB=BA?=
 =?UTF-8?q?=E7=9A=84=E6=95=B0=E6=8D=AE=E3=80=82=E5=90=8E=E5=8F=B0=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E5=9B=9E=E6=BB=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/SchoolEnterpriseAchievementsServiceImpl.java  | 10 +++++-----
 .../main/resources/mapper/dms/AchievementsMapper.xml   |  5 ++---
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/achievementLibrary/service/impl/SchoolEnterpriseAchievementsServiceImpl.java b/microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/achievementLibrary/service/impl/SchoolEnterpriseAchievementsServiceImpl.java
index cd7a47e4a..25b1c4ce7 100644
--- a/microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/achievementLibrary/service/impl/SchoolEnterpriseAchievementsServiceImpl.java
+++ b/microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/achievementLibrary/service/impl/SchoolEnterpriseAchievementsServiceImpl.java
@@ -61,11 +61,11 @@ public class SchoolEnterpriseAchievementsServiceImpl implements ISchoolEnterpris
     @Override
     public List<SchoolEnterpriseAchievements> selectSchoolEnterpriseAchievementsList(SchoolEnterpriseAchievements schoolEnterpriseAchievements)
     {
-        LoginUser loginUser = SecurityUtils.getLoginUser();
-        if (loginUser != null){
-            String username = loginUser.getUsername();
-            schoolEnterpriseAchievements.setCreateBy(username);
-        }
+//        LoginUser loginUser = SecurityUtils.getLoginUser();
+//        if (loginUser != null){
+//            String username = loginUser.getUsername();
+//            schoolEnterpriseAchievements.setCreateBy(username);
+//        }
         List<SchoolEnterpriseAchievements> list = schoolEnterpriseAchievementsMapper.selectSchoolEnterpriseAchievementsList(schoolEnterpriseAchievements);
         for (SchoolEnterpriseAchievements a : list) {
             a.setImages(achievementsService.buildFileInfoByIdents(a.getImages(), "4"));
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 8580dd590..365e79f64 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
@@ -77,10 +77,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectAchievementsById" parameterType="Long" resultType="com.microservices.dms.achievementLibrary.domain.Achievements">
         select a.id,a.achievement_name,a.hot_rank,a.field_1,a.field_2,a.field_3,a.attachment_count,a.is_expert_audit,a.achievement_type,a.source,a.source_id
-                ,u.login  as "userLogin",u.nickname as "userNickName",ue.gender as "gender",
+                ,u.login  as "userLogin",IFNULL(u.nickname,owner_name) as "userNickName",ue.gender as "gender",
                a.source_link,a.tags,a.summary,a.publishing_unit,a.address,a.is_featured,a.contact_person,a.contact_number,a.owner_id,a.owner_name, a.status,a.details,
-               a.reviewer,a.review_date,a.review_comments, a.images,a.attachments,a.create_by,a.create_time,a.update_by,a.update_time,
-               (select IFNULL(nickname,login) from users where login=owner_name) as remark
+               a.reviewer,a.review_date,a.review_comments, a.images,a.attachments,a.create_by,a.create_time,a.update_by,a.update_time
         from achievements a
                  left join users u on a.owner_name = u.login
                  left join user_extensions ue on u.id = ue.user_id