From 5cce09b5c2e520954d85e6e42b9b6f55472dbb59 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期五, 03 二月 2023 00:39:15 +0800
Subject: [PATCH] fix 修复 翻译模块 无法翻译实体属性值为 Null 的字段的问题
---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
index 9739806..94ddc4a 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
@@ -20,6 +20,8 @@
import com.ruoyi.common.mybatis.helper.DataBaseHelper;
import com.ruoyi.common.satoken.utils.LoginHelper;
import com.ruoyi.system.domain.*;
+import com.ruoyi.system.domain.vo.SysPostVo;
+import com.ruoyi.system.domain.vo.SysRoleVo;
import com.ruoyi.system.mapper.*;
import com.ruoyi.system.service.ISysUserService;
import lombok.RequiredArgsConstructor;
@@ -164,11 +166,11 @@
*/
@Override
public String selectUserRoleGroup(String userName) {
- List<SysRole> list = roleMapper.selectRolesByUserName(userName);
+ List<SysRoleVo> list = roleMapper.selectRolesByUserName(userName);
if (CollUtil.isEmpty(list)) {
return StringUtils.EMPTY;
}
- return StreamUtils.join(list, SysRole::getRoleName);
+ return StreamUtils.join(list, SysRoleVo::getRoleName);
}
/**
@@ -179,11 +181,11 @@
*/
@Override
public String selectUserPostGroup(String userName) {
- List<SysPost> list = postMapper.selectPostsByUserName(userName);
+ List<SysPostVo> list = postMapper.selectPostsByUserName(userName);
if (CollUtil.isEmpty(list)) {
return StringUtils.EMPTY;
}
- return StreamUtils.join(list, SysPost::getPostName);
+ return StreamUtils.join(list, SysPostVo::getPostName);
}
/**
--
Gitblit v1.9.3