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

patch: 补丁
All checks were successful
代码检查 / 代码检查 (pull_request) Successful in 20s
Details

Browse Source
This commit is contained in:
筱锋xiao_lfeng 2024-04-17 00:52:55 +08:00
parent 87bb3fb069
commit 0a788005a6
Signed by: XiaoLFeng
GPG Key ID: F693AA12AABBFA87
3 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/jsl/oa/aspect/CheckUserPermissionAspect.java
View File

@ -64,7 +64,7 @@ public class CheckUserPermissionAspect {
String getRoleAtAnnotation = checkAccountPermission.value(); String getRoleAtAnnotation = checkAccountPermission.value();
// 获取用户所在权限组 // 获取用户所在权限组
RoleDO getUserRole = roleDAO.getRoleNameByUid(getUserId); RoleDO getUserRole = roleDAO.getRoleByUserId(getUserId);
if (getUserRole != null) { if (getUserRole != null) {
List<String> permissions = gson.fromJson(getUserRole.getPermissions(), new TypeToken<List<String>>() { List<String> permissions = gson.fromJson(getUserRole.getPermissions(), new TypeToken<List<String>>() {
}.getType()); }.getType());

5
src/main/java/com/jsl/oa/dao/RoleDAO.java
View File

@ -72,11 +72,6 @@ public class RoleDAO {
} }
public RoleDO getRoleNameByUid(Long uid) {
return roleMapper.getRoleById(getRoleUserByUid(uid).getRid());
}
public boolean roleEdit(RoleDO getRole) { public boolean roleEdit(RoleDO getRole) {
if (roleMapper.roleEdit(getRole)) { if (roleMapper.roleEdit(getRole)) {
List<RoleDO> roleList = roleMapper.getRole(); List<RoleDO> roleList = roleMapper.getRole();

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

@ -1,9 +1,7 @@
package com.jsl.oa.services.impl; package com.jsl.oa.services.impl;
import com.google.gson.Gson; import com.google.gson.Gson;
import com.jsl.oa.annotations.NeedPermission;
import com.jsl.oa.annotations.UserAbleToUse; import com.jsl.oa.annotations.UserAbleToUse;
import com.jsl.oa.dao.PermissionDAO;
import com.jsl.oa.dao.RoleDAO; import com.jsl.oa.dao.RoleDAO;
import com.jsl.oa.dao.UserDAO; import com.jsl.oa.dao.UserDAO;
import com.jsl.oa.model.dodata.UserDO; import com.jsl.oa.model.dodata.UserDO;
@ -40,7 +38,6 @@ import java.util.regex.Pattern;
public class UserServiceImpl implements UserService { public class UserServiceImpl implements UserService {
private final UserDAO userDAO; private final UserDAO userDAO;
private final RoleDAO roleDAO; private final RoleDAO roleDAO;
private final PermissionDAO permissionDAO;
private final Gson gson; private final Gson gson;
@Override @Override
@ -126,7 +123,6 @@ public class UserServiceImpl implements UserService {
@Override @Override
@UserAbleToUse @UserAbleToUse
@NeedPermission("user:current")
public BaseResponse userCurrent( public BaseResponse userCurrent(
HttpServletRequest request, HttpServletRequest request,
String id, String id,
@ -236,7 +232,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.getRoleByUserId(userDO.getId()).getRoleName());
userProfileVo.setSex(Processing.getSex(userDO.getSex())); userProfileVo.setSex(Processing.getSex(userDO.getSex()));
return ResultUtil.success(userProfileVo); return ResultUtil.success(userProfileVo);
} }