From 74ed0e73c78c8f6332bbdc29b541437acb07b8f7 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期二, 07 五月 2024 16:14:53 +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 | 37 ++++++++++++++++++++++++++++++++++++-
1 files changed, 36 insertions(+), 1 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 450209f..5b4ede4 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,22 +5,32 @@
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.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.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) {
+ public UserService(UserMapper userMapper, RoleMapper roleMapper) {
this.userMapper = userMapper;
+ this.roleMapper = roleMapper;
}
@@ -70,6 +80,9 @@
User user = userMapper.selectOne(new QueryWrapper<User>().
eq("login_name", userDTO.getUserId()).eq("password", userDTO.getPass()));
if(user!=null){
+ //妫�鏌ユ槸璁╂湁鐧诲綍锛屾湁鐧诲綍鐩存帴閫�鍑�
+ StpUtil.logout(user.getId());
+ //閲嶆柊杩涜鐧诲綍
StpUtil.login(user.getId());
userDTO.setPass(null);
userDTO.setId(user.getId());
@@ -90,5 +103,27 @@
StpUtil.logout();
return true;
}
+
+ public Map<String,List<Object>> findAll() {
+ List<User> users = userMapper.findAll();
+ users.forEach(user -> {
+ user.setPassword(null);
+ });
+ 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