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

refactor: 修改用户服务实现，角色筛选由ID变更为名称
Some checks failed
代码检查 / 代码检查 (push) Failing after 21s
Details

Browse Source
This commit is contained in:
筱锋xiao_lfeng 2024-04-15 13:41:19 +08:00
parent f49b9db4d7
commit 0eaf43c764
Signed by: XiaoLFeng
GPG Key ID: F693AA12AABBFA87
7 changed files with 47 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

4
src/main/java/com/jsl/oa/dao/UserDAO.java
View File

@ -118,10 +118,10 @@ public class UserDAO {
*
* @param id
*/
public void userLock(Long id,Long isLock) {
public void userLock(Long id, Long isLock) {
log.info("\t> 执行 DAO 层 UserDAO.userLock 方法");
log.info("\t\t> 从 MySQL 获取数据");
userMapper.userLock(id,isLock);
userMapper.userLock(id, isLock);
}
public void userEditProfile(UserEditProfileVO userEditProfileVO) {

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

@ -32,7 +32,7 @@ public class UserCurrentBackVO {
@Data
@Accessors(chain = true)
public static class ReturnUserRole {
private Long rid;
private String name;
}
@Data

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

@ -25,7 +25,7 @@ public class UserReturnBackVO {
@Data
@Accessors(chain = true)
public static class ReturnUserRole {
private Long rid;
private String name;
}
@Data

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

@ -5,6 +5,7 @@ import com.jsl.oa.common.constant.BusinessConstants;
import com.jsl.oa.dao.PermissionDAO;
import com.jsl.oa.dao.RoleDAO;
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.*;
@ -281,14 +282,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(new UserReturnBackVO.ReturnUserRole().setName(getRoleString))
.setToken(token)
.setPermission(getPermissionForString);
return ResultUtil.success("登陆成功", userReturnBackVO);

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

@ -124,7 +124,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().getName()));
}
return ResultUtil.success(userCurrentBackVO);
}

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

@ -299,7 +299,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(new UserCurrentBackVO.ReturnUserRole().setName(getRoleString))
.setPermission(getPermissionForString);
return userCurrent;
}