From 18fb477ea840e3dd4b19ff63f68f994d31fab43b Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期二, 21 五月 2024 13:07:04 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/service/userInfo/UserService.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/service/userInfo/UserService.java b/north-glass-erp/src/main/java/com/example/erp/service/userInfo/UserService.java
index 17e1f71..2e32fbe 100644
--- a/north-glass-erp/src/main/java/com/example/erp/service/userInfo/UserService.java
+++ b/north-glass-erp/src/main/java/com/example/erp/service/userInfo/UserService.java
@@ -8,10 +8,7 @@
import com.example.erp.entity.userInfo.PermissionBasic;
import com.example.erp.entity.userInfo.Role;
import com.example.erp.entity.userInfo.User;
-import com.example.erp.mapper.userInfo.PermissionBasicMapper;
-import com.example.erp.mapper.userInfo.PermissionRoleMapper;
-import com.example.erp.mapper.userInfo.RoleMapper;
-import com.example.erp.mapper.userInfo.UserMapper;
+import com.example.erp.mapper.userInfo.*;
import com.example.erp.tools.TokenTools;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.cache.annotation.CacheEvict;
@@ -30,13 +27,15 @@
private final UserMapper userMapper;
private final RoleMapper roleMapper;
+ private final UserRoleMapper userRoleMapper;
private final PermissionRoleMapper permissionRoleMapper;
- public UserService(UserMapper userMapper, RoleMapper roleMapper, PermissionRoleMapper permissionRoleMapper) {
+ public UserService(UserMapper userMapper, RoleMapper roleMapper, PermissionRoleMapper permissionRoleMapper, UserRoleMapper userRoleMapper) {
this.userMapper = userMapper;
this.roleMapper = roleMapper;
this.permissionRoleMapper = permissionRoleMapper;
+ this.userRoleMapper = userRoleMapper;
}
@@ -94,7 +93,8 @@
userDTO.setId(user.getId());
userDTO.setUserName(user.getUserName());
userDTO.setToken(StpUtil.getTokenValue());
- userDTO.setPermissions(permissionRoleMapper.getUserEditPermission(user.getId()));
+ Boolean userIsAdmin= userRoleMapper.getUserIsAdmin(user.getId());
+ userDTO.setPermissions(permissionRoleMapper.getUserEditPermission(user.getId(),userIsAdmin));
return userDTO;
}else{
return null;
--
Gitblit v1.8.0