|
|
@@ -144,20 +144,18 @@ public class UserServiceImpl extends BaseServiceImpl<UserMapper, User> implement
|
|
|
|
|
|
@Override
|
|
|
public UserInfo userInfo(Long userId) {
|
|
|
- UserInfo userInfo = new UserInfo();
|
|
|
User user = baseMapper.selectById(userId);
|
|
|
- userInfo.setUser(user);
|
|
|
- if (Func.isNotEmpty(user)) {
|
|
|
- List<String> roleAlias = roleService.getRoleAliases(user.getRoleId());
|
|
|
- userInfo.setRoles(roleAlias);
|
|
|
- }
|
|
|
- return userInfo;
|
|
|
+ return buildUserInfo(user);
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
public UserInfo userInfo(String tenantId, String account, String password) {
|
|
|
- UserInfo userInfo = new UserInfo();
|
|
|
User user = baseMapper.getUser(tenantId, account, password);
|
|
|
+ return buildUserInfo(user);
|
|
|
+ }
|
|
|
+
|
|
|
+ private UserInfo buildUserInfo(User user) {
|
|
|
+ UserInfo userInfo = new UserInfo();
|
|
|
userInfo.setUser(user);
|
|
|
if (Func.isNotEmpty(user)) {
|
|
|
List<String> roleAlias = roleService.getRoleAliases(user.getRoleId());
|