From 6c3b64f52182038accf1c27a2f040d64ddc4528a Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期五, 07 六月 2024 11:15:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
user-server/src/main/java/com/yuanchu/mom/service/impl/UserServiceImp.java | 7 ++++++-
1 files changed, 6 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 625909b..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));
}
//鑾峰彇璁惧璐熻矗浜�
--
Gitblit v1.9.3