From 9690c66ebb0e0f9322e96db318b0dbd9aeeace2f Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期四, 16 五月 2024 13:59:41 +0800
Subject: [PATCH] 修改删除失败后前端返回信息，修改流程卡打印界面面积精准度
---
north-glass-erp/src/main/java/com/example/erp/service/userInfo/UserService.java | 35 ++++++++++++++++++++++++++++++++---
1 files changed, 32 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 50451ac..17e1f71 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,38 @@
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.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.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;
- public UserService(UserMapper userMapper) {
+ private final PermissionRoleMapper permissionRoleMapper;
+
+ public UserService(UserMapper userMapper, RoleMapper roleMapper, PermissionRoleMapper permissionRoleMapper) {
this.userMapper = userMapper;
+ this.roleMapper = roleMapper;
+ this.permissionRoleMapper = permissionRoleMapper;
}
@@ -80,6 +94,7 @@
userDTO.setId(user.getId());
userDTO.setUserName(user.getUserName());
userDTO.setToken(StpUtil.getTokenValue());
+ userDTO.setPermissions(permissionRoleMapper.getUserEditPermission(user.getId()));
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