From 1ef275124e5c311daf06b84e961c62e43b748778 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期二, 21 五月 2024 11:41:07 +0800
Subject: [PATCH] 后端获取报表数据
---
north-glass-erp/src/main/java/com/example/erp/service/userInfo/UserService.java | 37 +++++++++++++++++++++++++++++++++----
1 files changed, 33 insertions(+), 4 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 50451ac..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,24 +5,37 @@
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.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;
import org.springframework.cache.annotation.Cacheable;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import java.util.Collections;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
@Service
@DS("user_info")
public class UserService {
private final UserMapper userMapper;
+ private final RoleMapper roleMapper;
+ private final UserRoleMapper userRoleMapper;
- public UserService(UserMapper userMapper) {
+ 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;
}
@@ -80,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;
@@ -96,12 +111,26 @@
return true;
}
- public List<User> findAll() {
+ public Map<String,List<Object>> findAll() {
List<User> users = userMapper.findAll();
users.forEach(user -> {
user.setPassword(null);
});
- return users;
+ Map<String,List<Object>> map = new HashMap<>();
+
+ map.put("users", Collections.singletonList(users));
+ map.put("role", Collections.singletonList(
+ roleMapper.selectList(
+ new QueryWrapper<Role>()
+ .ne("role","admin")
+ )
+ ));
+ return map;
+ }
+
+ public Boolean userDelete(Integer id) {
+
+ return userMapper.userDelete(id);
}
}
--
Gitblit v1.8.0