From 946e8e2afb1a683c7b17bf52446a13e3c10b140a Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期六, 08 六月 2024 17:34:26 +0800
Subject: [PATCH] 部分修复
---
user-server/src/main/java/com/yuanchu/mom/service/impl/UserServiceImp.java | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/user-server/src/main/java/com/yuanchu/mom/service/impl/UserServiceImp.java b/user-server/src/main/java/com/yuanchu/mom/service/impl/UserServiceImp.java
index 805f6c4..7e8b4ec 100644
--- a/user-server/src/main/java/com/yuanchu/mom/service/impl/UserServiceImp.java
+++ b/user-server/src/main/java/com/yuanchu/mom/service/impl/UserServiceImp.java
@@ -13,6 +13,7 @@
import com.yuanchu.mom.mapper.RoleMapper;
import com.yuanchu.mom.mapper.UserMapper;
import com.yuanchu.mom.pojo.Custom;
+import com.yuanchu.mom.pojo.Role;
import com.yuanchu.mom.pojo.User;
import com.yuanchu.mom.service.CustomService;
import com.yuanchu.mom.service.UserService;
@@ -26,6 +27,7 @@
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.stream.Collectors;
@Service
public class UserServiceImp implements UserService {
@@ -107,7 +109,10 @@
@Override
public List<User> getUserMenu() {
- return userMapper.selectList(Wrappers.<User>lambdaQuery().eq(User::getState, 1).select(User::getName, User::getId));
+ List<Integer> roleIds = roleMapper.selectList(Wrappers.<Role>lambdaQuery().ne(Role::getCategory, 10003)).stream().map(Role::getId).distinct().collect(Collectors.toList());
+ return userMapper.selectList(Wrappers.<User>lambdaQuery()
+ .in(User::getRoleId, roleIds)
+ .eq(User::getState, 1).select(User::getName, User::getId));
}
//鑾峰彇璁惧璐熻矗浜�
@@ -159,6 +164,7 @@
user.setCompany(BeanUtil.isNotEmpty(custom)?(custom.getId()+""):companyName);
user.setAddress("鏈～鍐�");
user.setRoleId(personDto.getRoleId()>10000?0:personDto.getRoleId());
+ user.setCompanyId(person.getCompanyId());
userMapper.insert(user);
} else {
user.setName(person.getName());
@@ -170,6 +176,7 @@
user.setCreateTime(null);
user.setUpdateUser(null);
user.setUpdateTime(null);
+ user.setCompanyId(person.getCompanyId());
userMapper.updateById(user);
}
});
--
Gitblit v1.9.3