WxxyDeveloper/JSL_OrganizeInternalOA
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'refs/heads/master' into feature-xiaolfeng

Browse Source 
# Conflicts:
#	src/main/java/com/jsl/oa/controllers/AuthController.java
#	src/main/java/com/jsl/oa/utils/Processing.java
This commit is contained in:
筱锋xiao_lfeng 2024-04-16 15:03:26 +08:00
commit f153eb221e
Signed by: XiaoLFeng
GPG Key ID: F693AA12AABBFA87
7 changed files with 47 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/com/jsl/oa/controllers/AuthController.java
View File

@ -178,8 +178,7 @@ public class AuthController {
if (bindingResult.hasErrors()) {
return ResultUtil.error(ErrorCode.REQUEST_BODY_ERROR, Processing.getValidatedErrorList(bindingResult));
}
return authService.
authChangePassword((UserChangePasswordVO) request, (HttpServletRequest) userChangePasswordVO);
return authService.authChangePassword(userChangePasswordVO, request);
}
/**

2
src/main/java/com/jsl/oa/model/vodata/UserAllCurrentVO.java
View File

@ -9,5 +9,5 @@ public class UserAllCurrentVO {
private Long page;
private Long limit;
private String search;
private Long role;
private String role;
}

8
src/main/java/com/jsl/oa/model/vodata/UserCurrentBackVO.java
View File

@ -25,16 +25,10 @@ public class UserCurrentBackVO {
@Accessors(chain = true)
public static class UserCurrent {
private ReturnUser user;
private ReturnUserRole role;
private String role;
private List<String> permission;
}
@Data
@Accessors(chain = true)
public static class ReturnUserRole {
private Long rid;
}
@Data
@Accessors(chain = true)
public static class ReturnUser {

8
src/main/java/com/jsl/oa/model/vodata/UserReturnBackVO.java
View File

@ -18,16 +18,10 @@ import java.util.List;
@Accessors(chain = true)
public class UserReturnBackVO {
private ReturnUser user;
private ReturnUserRole role;
private String role;
private String token;
private List<String> permission;
@Data
@Accessors(chain = true)
public static class ReturnUserRole {
private Long rid;
}
@Data
@Accessors(chain = true)
public static class ReturnUser {

12
src/main/java/com/jsl/oa/services/impl/AuthServiceImpl.java
View File

@ -6,6 +6,7 @@ import com.jsl.oa.dao.PermissionDAO;
import com.jsl.oa.dao.RoleDAO;
import com.jsl.oa.mapper.RoleMapper;
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.UserDO;
import com.jsl.oa.model.vodata.*;
@ -283,14 +284,21 @@ public class AuthServiceImpl implements AuthService {
} else {
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()
.setId(userDO.getId())
.setJobId(userDO.getJobId())
.setUsername(userDO.getUsername())
.setEmail(userDO.getEmail())
.setPhone(userDO.getPhone()))
.setRole(new UserReturnBackVO.ReturnUserRole()
.setRid(getUserRole.getRid()))
.setRole(getRoleString)
.setToken(token)
.setPermission(getPermissionForString);
return ResultUtil.success("登陆成功", userReturnBackVO);

4
src/main/java/com/jsl/oa/services/impl/UserServiceImpl.java
View File

@ -126,7 +126,7 @@ public class UserServiceImpl implements UserService {
}
// 检查是否存在 Role 筛选
if (userAllCurrentVO.getRole() != null) {
userCurrentBackVO.getUsers().removeIf(it -> !userAllCurrentVO.getRole().equals(it.getRole().getRid()));
userCurrentBackVO.getUsers().removeIf(it -> !userAllCurrentVO.getRole().equals(it.getRole()));
}
return ResultUtil.success(userCurrentBackVO);
}
@ -271,7 +271,7 @@ public class UserServiceImpl implements UserService {
UserDO userDO = userDAO.getUserById(Processing.getAuthHeaderToUserId(request));
UserProfileVo userProfileVo = new UserProfileVo();
Processing.copyProperties(userDO, userProfileVo);
userProfileVo.setRole(roleDAO.getRoleNameByUid(userDO.getId()).getDisplayName());
userProfileVo.setRole(roleDAO.getRoleNameByUid(userDO.getId()).getRoleName());
userProfileVo.setSex(Processing.getSex(userDO.getSex()));
return ResultUtil.success(userProfileVo);
}

55
src/main/java/com/jsl/oa/utils/Processing.java
View File

@ -298,30 +298,37 @@ public class Processing {
// 获取权限列表信息
getPermissionForString = permissionDAO.getPermission(userDO.getId());
}
userCurrent.setUser(new UserCurrentBackVO.ReturnUser().
setId(userDO.getId()).
setJobId(userDO.getJobId()).
setUsername(userDO.getUsername()).
setAddress(userDO.getAddress()).
setPhone(userDO.getPhone()).
setEmail(userDO.getEmail()).
setAge(userDO.getAge()).
setSignature(userDO.getSignature()).
setAvatar(userDO.getAvatar()).
setNickname(userDO.getNickname()).
setSex(userDO.getSex()).
setEnabled(userDO.getEnabled()).
setAccountNoExpired(userDO.getAccountNoExpired()).
setCredentialsNoExpired(userDO.getCredentialsNoExpired()).
setRecommend(userDO.getRecommend()).
setAccountNoLocked(userDO.getAccountNoLocked()).
setDescription(userDO.getDescription()).
setCreatedAt(userDO.getCreatedAt()).
setUpdatedAt(userDO.getUpdatedAt()).
setIsDelete(userDO.getIsDelete())).
setRole(new UserCurrentBackVO.ReturnUserRole().
setRid(getUserRole.getRid())).
setPermission(getPermissionForString);
RoleDO getRole = roleDAO.getRoleById(getUserRole.getRid());
String getRoleString;
if (getRole != null) {
getRoleString = getRole.getRoleName();
} else {
getRoleString = "default";
}
userCurrent
.setUser(new UserCurrentBackVO.ReturnUser()
.setId(userDO.getId())
.setJobId(userDO.getJobId())
.setUsername(userDO.getUsername())
.setAddress(userDO.getAddress())
.setPhone(userDO.getPhone())
.setEmail(userDO.getEmail())
.setAge(userDO.getAge())
.setSignature(userDO.getSignature())
.setAvatar(userDO.getAvatar())
.setNickname(userDO.getNickname())
.setSex(userDO.getSex())
.setEnabled(userDO.getEnabled())
.setAccountNoExpired(userDO.getAccountNoExpired())
.setCredentialsNoExpired(userDO.getCredentialsNoExpired())
.setRecommend(userDO.getRecommend())
.setAccountNoLocked(userDO.getAccountNoLocked())
.setDescription(userDO.getDescription())
.setCreatedAt(userDO.getCreatedAt())
.setUpdatedAt(userDO.getUpdatedAt())
.setIsDelete(userDO.getIsDelete()))
.setRole(getRoleString)
.setPermission(getPermissionForString);
return userCurrent;
}