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 implements Us private final TokenManager tokenManager; + private final DictDataService dictDataService; + private final UserConverter userConverter; /** @@ -274,7 +276,15 @@ public class UserServiceImpl extends ServiceImpl implements Us */ @Override public List listExportUsers(UserPageQuery queryParams) { - return this.baseMapper.listExportUsers(queryParams); + List userExportDTOS = this.baseMapper.listExportUsers(queryParams); + //获取角色的字典数据 + List list = dictDataService.list(new LambdaQueryWrapper().eq(DictData::getDictCode, DictCodeEnum.GENDER.getValue())); + Map 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