From 5cc34872785ce8e48bcdaccd226a46e5c7358630 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期四, 23 五月 2024 08:17:55 +0800
Subject: [PATCH] 添加多选修改排版状态功能
---
north-glass-erp/src/main/java/com/example/erp/service/userInfo/UserService.java | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 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 5b4ede4..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
@@ -5,10 +5,10 @@
import com.baomidou.dynamic.datasource.annotation.DS;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.example.erp.controller.dto.UserDTO;
+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.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;
@@ -27,10 +27,15 @@
private final UserMapper userMapper;
private final RoleMapper roleMapper;
+ private final UserRoleMapper userRoleMapper;
- public UserService(UserMapper userMapper, RoleMapper roleMapper) {
+ private final PermissionRoleMapper permissionRoleMapper;
+
+ public UserService(UserMapper userMapper, RoleMapper roleMapper, PermissionRoleMapper permissionRoleMapper, UserRoleMapper userRoleMapper) {
this.userMapper = userMapper;
this.roleMapper = roleMapper;
+ this.permissionRoleMapper = permissionRoleMapper;
+ this.userRoleMapper = userRoleMapper;
}
@@ -88,6 +93,8 @@
userDTO.setId(user.getId());
userDTO.setUserName(user.getUserName());
userDTO.setToken(StpUtil.getTokenValue());
+ Boolean userIsAdmin= userRoleMapper.getUserIsAdmin(user.getId());
+ userDTO.setPermissions(permissionRoleMapper.getUserEditPermission(user.getId(),userIsAdmin));
return userDTO;
}else{
return null;
--
Gitblit v1.8.0