From d15af9f51e483f46191e791c0fede1ba0b6e9249 Mon Sep 17 00:00:00 2001
From: Theo <971366405@qq.com>
Date: Wed, 22 Jan 2025 16:45:28 +0800
Subject: [PATCH] =?UTF-8?q?refactor(system):=20=E4=BC=98=E5=8C=96=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E5=AF=BC=E5=87=BA=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 移除 UserMapper 中的性别转换逻辑
- 在 UserServiceImpl 中添加字典数据获取和性别转换逻辑
---
 .../system/service/impl/UserServiceImpl.java  | 38 ++++++++++++-------
 .../resources/mapper/system/UserMapper.xml    |  6 +--
 2 files changed, 25 insertions(+), 19 deletions(-)

diff --git a/src/main/java/com/youlai/boot/system/service/impl/UserServiceImpl.java b/src/main/java/com/youlai/boot/system/service/impl/UserServiceImpl.java
index e9beb707..c4f74448 100644
--- a/src/main/java/com/youlai/boot/system/service/impl/UserServiceImpl.java
+++ b/src/main/java/com/youlai/boot/system/service/impl/UserServiceImpl.java
@@ -10,29 +10,29 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.youlai.boot.common.constant.RedisConstants;
 import com.youlai.boot.common.constant.SystemConstants;
-import com.youlai.boot.core.security.manager.TokenManager;
+import com.youlai.boot.common.exception.BusinessException;
 import com.youlai.boot.common.model.Option;
+import com.youlai.boot.core.security.manager.TokenManager;
+import com.youlai.boot.core.security.service.PermissionService;
+import com.youlai.boot.core.security.util.SecurityUtils;
 import com.youlai.boot.shared.mail.service.MailService;
 import com.youlai.boot.shared.sms.enums.SmsTypeEnum;
 import com.youlai.boot.shared.sms.service.SmsService;
+import com.youlai.boot.system.converter.UserConverter;
+import com.youlai.boot.system.enums.DictCodeEnum;
+import com.youlai.boot.system.mapper.UserMapper;
+import com.youlai.boot.system.model.bo.UserBO;
+import com.youlai.boot.system.model.dto.UserAuthInfo;
+import com.youlai.boot.system.model.dto.UserExportDTO;
+import com.youlai.boot.system.model.entity.DictData;
 import com.youlai.boot.system.model.entity.User;
 import com.youlai.boot.system.model.entity.UserRole;
 import com.youlai.boot.system.model.form.*;
-import com.youlai.boot.system.converter.UserConverter;
-import com.youlai.boot.common.exception.BusinessException;
-import com.youlai.boot.system.model.vo.UserProfileVO;
-import com.youlai.boot.core.security.util.SecurityUtils;
-import com.youlai.boot.system.mapper.UserMapper;
-import com.youlai.boot.system.model.dto.UserAuthInfo;
-import com.youlai.boot.system.model.bo.UserBO;
 import com.youlai.boot.system.model.query.UserPageQuery;
-import com.youlai.boot.system.model.dto.UserExportDTO;
 import com.youlai.boot.system.model.vo.UserInfoVO;
 import com.youlai.boot.system.model.vo.UserPageVO;
-import com.youlai.boot.core.security.service.PermissionService;
-import com.youlai.boot.system.service.RoleService;
-import com.youlai.boot.system.service.UserRoleService;
-import com.youlai.boot.system.service.UserService;
+import com.youlai.boot.system.model.vo.UserProfileVO;
+import com.youlai.boot.system.service.*;
 import lombok.RequiredArgsConstructor;
 import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.security.crypto.password.PasswordEncoder;
@@ -69,6 +69,8 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
 
     private final TokenManager tokenManager;
 
+    private final DictDataService dictDataService;
+
     private final UserConverter userConverter;
 
     /**
@@ -274,7 +276,15 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
      */
     @Override
     public List<UserExportDTO> listExportUsers(UserPageQuery queryParams) {
-        return this.baseMapper.listExportUsers(queryParams);
+        List<UserExportDTO> userExportDTOS = this.baseMapper.listExportUsers(queryParams);
+        //获取角色的字典数据
+        List<DictData> list = dictDataService.list(new LambdaQueryWrapper<DictData>().eq(DictData::getDictCode, DictCodeEnum.GENDER.getValue()));
+        Map<String, String> genderMap = list.stream().collect(Collectors.toMap(DictData::getValue, DictData::getLabel));
+        userExportDTOS.forEach(userExportDTO -> {
+            String genderLabel = genderMap.get(userExportDTO.getGender());
+            userExportDTO.setGender(genderLabel);
+        });
+        return null;
     }
 
     /**
diff --git a/src/main/resources/mapper/system/UserMapper.xml b/src/main/resources/mapper/system/UserMapper.xml
index 1cfc5907..0940c488 100644
--- a/src/main/resources/mapper/system/UserMapper.xml
+++ b/src/main/resources/mapper/system/UserMapper.xml
@@ -184,11 +184,7 @@
             u.nickname,
             u.mobile,
             u.email,
-            CASE u.gender
-                WHEN 1 THEN '男'
-                WHEN 2 THEN '女'
-                ELSE '保密'
-            END gender,
+            u.gender,
             d.NAME AS dept_name,
             u.create_time
         FROM