通信LIMS后端
blame | 历史 | 补丁 | 提交 | 提交对比 | 显示空白
zss
2024-06-07 85d76785cd5a49ee4e942419afd197bc7ee97d68 
 user-server/src/main/java/com/yuanchu/mom/service/impl/UserServiceImp.java


@@ -2,6 +2,7 @@




import cn.hutool.core.bean.BeanUtil;


import com.alibaba.fastjson.JSON;


import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;


import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;


import com.baomidou.mybatisplus.core.metadata.IPage;


import com.baomidou.mybatisplus.core.toolkit.Wrappers;


@@ -27,6 +28,7 @@


import java.util.HashMap;


import java.util.List;


import java.util.Map;


import java.util.function.Consumer;


import java.util.stream.Collectors;




@Service


@@ -109,7 +111,8 @@




    @Override


    public List<User> getUserMenu() {


        List<Integer> roleIds = roleMapper.selectList(Wrappers.<Role>lambdaQuery().ne(Role::getCategory, 10003)).stream().map(Role::getId).distinct().collect(Collectors.toList());


        List<Integer> roleIds = roleMapper.selectList(Wrappers.<Role>lambdaQuery()


                .ne(Role::getCategory, 10003).or(wrapper -> wrapper.isNull(Role::getCategory))).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));