diff --git a/src/main/java/com/jsl/oa/aspect/CheckUserPermissionAspect.java b/src/main/java/com/jsl/oa/aspect/CheckUserPermissionAspect.java index 8c60eff..f17128d 100644 --- a/src/main/java/com/jsl/oa/aspect/CheckUserPermissionAspect.java +++ b/src/main/java/com/jsl/oa/aspect/CheckUserPermissionAspect.java @@ -64,7 +64,7 @@ public class CheckUserPermissionAspect { String getRoleAtAnnotation = checkAccountPermission.value(); // 获取用户所在权限组 - RoleDO getUserRole = roleDAO.getRoleNameByUid(getUserId); + RoleDO getUserRole = roleDAO.getRoleByUserId(getUserId); if (getUserRole != null) { List permissions = gson.fromJson(getUserRole.getPermissions(), new TypeToken>() { }.getType()); diff --git a/src/main/java/com/jsl/oa/dao/RoleDAO.java b/src/main/java/com/jsl/oa/dao/RoleDAO.java index c237bee..b4fe0b1 100644 --- a/src/main/java/com/jsl/oa/dao/RoleDAO.java +++ b/src/main/java/com/jsl/oa/dao/RoleDAO.java @@ -72,11 +72,6 @@ public class RoleDAO { } - public RoleDO getRoleNameByUid(Long uid) { - return roleMapper.getRoleById(getRoleUserByUid(uid).getRid()); - } - - public boolean roleEdit(RoleDO getRole) { if (roleMapper.roleEdit(getRole)) { List roleList = roleMapper.getRole(); diff --git a/src/main/java/com/jsl/oa/services/impl/UserServiceImpl.java b/src/main/java/com/jsl/oa/services/impl/UserServiceImpl.java index 98f3a9c..134a190 100755 --- a/src/main/java/com/jsl/oa/services/impl/UserServiceImpl.java +++ b/src/main/java/com/jsl/oa/services/impl/UserServiceImpl.java @@ -1,9 +1,7 @@ package com.jsl.oa.services.impl; import com.google.gson.Gson; -import com.jsl.oa.annotations.NeedPermission; import com.jsl.oa.annotations.UserAbleToUse; -import com.jsl.oa.dao.PermissionDAO; import com.jsl.oa.dao.RoleDAO; import com.jsl.oa.dao.UserDAO; import com.jsl.oa.model.dodata.UserDO; @@ -40,7 +38,6 @@ import java.util.regex.Pattern; public class UserServiceImpl implements UserService { private final UserDAO userDAO; private final RoleDAO roleDAO; - private final PermissionDAO permissionDAO; private final Gson gson; @Override @@ -126,7 +123,6 @@ public class UserServiceImpl implements UserService { @Override @UserAbleToUse - @NeedPermission("user:current") public BaseResponse userCurrent( HttpServletRequest request, String id, @@ -236,7 +232,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()).getRoleName()); + userProfileVo.setRole(roleDAO.getRoleByUserId(userDO.getId()).getRoleName()); userProfileVo.setSex(Processing.getSex(userDO.getSex())); return ResultUtil.success(userProfileVo); }