|
@@ -161,18 +161,16 @@ public class UserManagementFacade {
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- public UserDto loadUserByUsername(String username) {
|
|
|
+ public CommonResult<UserDto> loadUserByUsername(String username) {
|
|
|
QueryWrapper<User> userQueryWrapper = new QueryWrapper<>();
|
|
|
userQueryWrapper.eq("username", username);
|
|
|
userQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey());
|
|
|
List<User> userList = userFacade.list(userQueryWrapper);
|
|
|
if (userList.size() == 0) {
|
|
|
- CommonResult.failed("用户不存在!");
|
|
|
-// Asserts.fail("用户不存在!");
|
|
|
+ return CommonResult.failed("用户不存在!");
|
|
|
}
|
|
|
if (userList.size() > 1) {
|
|
|
- CommonResult.failed("当前账号异常!");
|
|
|
-// Asserts.fail("当前账号异常!");
|
|
|
+ return CommonResult.failed("当前账号异常!");
|
|
|
}
|
|
|
|
|
|
UserDto userDTO = new UserDto();
|
|
@@ -194,7 +192,7 @@ public class UserManagementFacade {
|
|
|
BeanUtils.copyProperties(user, userDTO);
|
|
|
userDTO.setUserName(user.getUsername());
|
|
|
userDTO.setRoles(roleIdNames);
|
|
|
- return userDTO;
|
|
|
+ return CommonResult.success(userDTO);
|
|
|
}
|
|
|
|
|
|
/**
|