Compare commits
No commits in common. "f153eb221e302d175981fb90ddd8d468ba1b4694" and "1f4b85f9b594bcf49dc4cb3804fa3dbc65d6a649" have entirely different histories.
f153eb221e
...
1f4b85f9b5
@ -178,7 +178,8 @@ public class AuthController {
|
|||||||
if (bindingResult.hasErrors()) {
|
if (bindingResult.hasErrors()) {
|
||||||
return ResultUtil.error(ErrorCode.REQUEST_BODY_ERROR, Processing.getValidatedErrorList(bindingResult));
|
return ResultUtil.error(ErrorCode.REQUEST_BODY_ERROR, Processing.getValidatedErrorList(bindingResult));
|
||||||
}
|
}
|
||||||
return authService.authChangePassword(userChangePasswordVO, request);
|
return authService.
|
||||||
|
authChangePassword((UserChangePasswordVO) request, (HttpServletRequest) userChangePasswordVO);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -9,5 +9,5 @@ public class UserAllCurrentVO {
|
|||||||
private Long page;
|
private Long page;
|
||||||
private Long limit;
|
private Long limit;
|
||||||
private String search;
|
private String search;
|
||||||
private String role;
|
private Long role;
|
||||||
}
|
}
|
||||||
|
@ -25,10 +25,16 @@ public class UserCurrentBackVO {
|
|||||||
@Accessors(chain = true)
|
@Accessors(chain = true)
|
||||||
public static class UserCurrent {
|
public static class UserCurrent {
|
||||||
private ReturnUser user;
|
private ReturnUser user;
|
||||||
private String role;
|
private ReturnUserRole role;
|
||||||
private List<String> permission;
|
private List<String> permission;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Data
|
||||||
|
@Accessors(chain = true)
|
||||||
|
public static class ReturnUserRole {
|
||||||
|
private Long rid;
|
||||||
|
}
|
||||||
|
|
||||||
@Data
|
@Data
|
||||||
@Accessors(chain = true)
|
@Accessors(chain = true)
|
||||||
public static class ReturnUser {
|
public static class ReturnUser {
|
||||||
|
@ -18,10 +18,16 @@ import java.util.List;
|
|||||||
@Accessors(chain = true)
|
@Accessors(chain = true)
|
||||||
public class UserReturnBackVO {
|
public class UserReturnBackVO {
|
||||||
private ReturnUser user;
|
private ReturnUser user;
|
||||||
private String role;
|
private ReturnUserRole role;
|
||||||
private String token;
|
private String token;
|
||||||
private List<String> permission;
|
private List<String> permission;
|
||||||
|
|
||||||
|
@Data
|
||||||
|
@Accessors(chain = true)
|
||||||
|
public static class ReturnUserRole {
|
||||||
|
private Long rid;
|
||||||
|
}
|
||||||
|
|
||||||
@Data
|
@Data
|
||||||
@Accessors(chain = true)
|
@Accessors(chain = true)
|
||||||
public static class ReturnUser {
|
public static class ReturnUser {
|
||||||
|
@ -6,7 +6,6 @@ import com.jsl.oa.dao.PermissionDAO;
|
|||||||
import com.jsl.oa.dao.RoleDAO;
|
import com.jsl.oa.dao.RoleDAO;
|
||||||
import com.jsl.oa.mapper.RoleMapper;
|
import com.jsl.oa.mapper.RoleMapper;
|
||||||
import com.jsl.oa.mapper.UserMapper;
|
import com.jsl.oa.mapper.UserMapper;
|
||||||
import com.jsl.oa.model.dodata.RoleDO;
|
|
||||||
import com.jsl.oa.model.dodata.RoleUserDO;
|
import com.jsl.oa.model.dodata.RoleUserDO;
|
||||||
import com.jsl.oa.model.dodata.UserDO;
|
import com.jsl.oa.model.dodata.UserDO;
|
||||||
import com.jsl.oa.model.vodata.*;
|
import com.jsl.oa.model.vodata.*;
|
||||||
@ -284,21 +283,14 @@ public class AuthServiceImpl implements AuthService {
|
|||||||
} else {
|
} else {
|
||||||
getUserRole.setUid(null);
|
getUserRole.setUid(null);
|
||||||
}
|
}
|
||||||
// 获取角色信息
|
|
||||||
RoleDO getRole = roleDAO.getRoleById(getUserRole.getRid());
|
|
||||||
String getRoleString;
|
|
||||||
if (getRole != null) {
|
|
||||||
getRoleString = getRole.getRoleName();
|
|
||||||
} else {
|
|
||||||
getRoleString = "default";
|
|
||||||
}
|
|
||||||
userReturnBackVO.setUser(new UserReturnBackVO.ReturnUser()
|
userReturnBackVO.setUser(new UserReturnBackVO.ReturnUser()
|
||||||
.setId(userDO.getId())
|
.setId(userDO.getId())
|
||||||
.setJobId(userDO.getJobId())
|
.setJobId(userDO.getJobId())
|
||||||
.setUsername(userDO.getUsername())
|
.setUsername(userDO.getUsername())
|
||||||
.setEmail(userDO.getEmail())
|
.setEmail(userDO.getEmail())
|
||||||
.setPhone(userDO.getPhone()))
|
.setPhone(userDO.getPhone()))
|
||||||
.setRole(getRoleString)
|
.setRole(new UserReturnBackVO.ReturnUserRole()
|
||||||
|
.setRid(getUserRole.getRid()))
|
||||||
.setToken(token)
|
.setToken(token)
|
||||||
.setPermission(getPermissionForString);
|
.setPermission(getPermissionForString);
|
||||||
return ResultUtil.success("登陆成功", userReturnBackVO);
|
return ResultUtil.success("登陆成功", userReturnBackVO);
|
||||||
|
@ -126,7 +126,7 @@ public class UserServiceImpl implements UserService {
|
|||||||
}
|
}
|
||||||
// 检查是否存在 Role 筛选
|
// 检查是否存在 Role 筛选
|
||||||
if (userAllCurrentVO.getRole() != null) {
|
if (userAllCurrentVO.getRole() != null) {
|
||||||
userCurrentBackVO.getUsers().removeIf(it -> !userAllCurrentVO.getRole().equals(it.getRole()));
|
userCurrentBackVO.getUsers().removeIf(it -> !userAllCurrentVO.getRole().equals(it.getRole().getRid()));
|
||||||
}
|
}
|
||||||
return ResultUtil.success(userCurrentBackVO);
|
return ResultUtil.success(userCurrentBackVO);
|
||||||
}
|
}
|
||||||
@ -271,7 +271,7 @@ public class UserServiceImpl implements UserService {
|
|||||||
UserDO userDO = userDAO.getUserById(Processing.getAuthHeaderToUserId(request));
|
UserDO userDO = userDAO.getUserById(Processing.getAuthHeaderToUserId(request));
|
||||||
UserProfileVo userProfileVo = new UserProfileVo();
|
UserProfileVo userProfileVo = new UserProfileVo();
|
||||||
Processing.copyProperties(userDO, userProfileVo);
|
Processing.copyProperties(userDO, userProfileVo);
|
||||||
userProfileVo.setRole(roleDAO.getRoleNameByUid(userDO.getId()).getRoleName());
|
userProfileVo.setRole(roleDAO.getRoleNameByUid(userDO.getId()).getDisplayName());
|
||||||
userProfileVo.setSex(Processing.getSex(userDO.getSex()));
|
userProfileVo.setSex(Processing.getSex(userDO.getSex()));
|
||||||
return ResultUtil.success(userProfileVo);
|
return ResultUtil.success(userProfileVo);
|
||||||
}
|
}
|
||||||
|
@ -298,37 +298,30 @@ public class Processing {
|
|||||||
// 获取权限列表信息
|
// 获取权限列表信息
|
||||||
getPermissionForString = permissionDAO.getPermission(userDO.getId());
|
getPermissionForString = permissionDAO.getPermission(userDO.getId());
|
||||||
}
|
}
|
||||||
RoleDO getRole = roleDAO.getRoleById(getUserRole.getRid());
|
userCurrent.setUser(new UserCurrentBackVO.ReturnUser().
|
||||||
String getRoleString;
|
setId(userDO.getId()).
|
||||||
if (getRole != null) {
|
setJobId(userDO.getJobId()).
|
||||||
getRoleString = getRole.getRoleName();
|
setUsername(userDO.getUsername()).
|
||||||
} else {
|
setAddress(userDO.getAddress()).
|
||||||
getRoleString = "default";
|
setPhone(userDO.getPhone()).
|
||||||
}
|
setEmail(userDO.getEmail()).
|
||||||
userCurrent
|
setAge(userDO.getAge()).
|
||||||
.setUser(new UserCurrentBackVO.ReturnUser()
|
setSignature(userDO.getSignature()).
|
||||||
.setId(userDO.getId())
|
setAvatar(userDO.getAvatar()).
|
||||||
.setJobId(userDO.getJobId())
|
setNickname(userDO.getNickname()).
|
||||||
.setUsername(userDO.getUsername())
|
setSex(userDO.getSex()).
|
||||||
.setAddress(userDO.getAddress())
|
setEnabled(userDO.getEnabled()).
|
||||||
.setPhone(userDO.getPhone())
|
setAccountNoExpired(userDO.getAccountNoExpired()).
|
||||||
.setEmail(userDO.getEmail())
|
setCredentialsNoExpired(userDO.getCredentialsNoExpired()).
|
||||||
.setAge(userDO.getAge())
|
setRecommend(userDO.getRecommend()).
|
||||||
.setSignature(userDO.getSignature())
|
setAccountNoLocked(userDO.getAccountNoLocked()).
|
||||||
.setAvatar(userDO.getAvatar())
|
setDescription(userDO.getDescription()).
|
||||||
.setNickname(userDO.getNickname())
|
setCreatedAt(userDO.getCreatedAt()).
|
||||||
.setSex(userDO.getSex())
|
setUpdatedAt(userDO.getUpdatedAt()).
|
||||||
.setEnabled(userDO.getEnabled())
|
setIsDelete(userDO.getIsDelete())).
|
||||||
.setAccountNoExpired(userDO.getAccountNoExpired())
|
setRole(new UserCurrentBackVO.ReturnUserRole().
|
||||||
.setCredentialsNoExpired(userDO.getCredentialsNoExpired())
|
setRid(getUserRole.getRid())).
|
||||||
.setRecommend(userDO.getRecommend())
|
setPermission(getPermissionForString);
|
||||||
.setAccountNoLocked(userDO.getAccountNoLocked())
|
|
||||||
.setDescription(userDO.getDescription())
|
|
||||||
.setCreatedAt(userDO.getCreatedAt())
|
|
||||||
.setUpdatedAt(userDO.getUpdatedAt())
|
|
||||||
.setIsDelete(userDO.getIsDelete()))
|
|
||||||
.setRole(getRoleString)
|
|
||||||
.setPermission(getPermissionForString);
|
|
||||||
return userCurrent;
|
return userCurrent;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user