From 85d76785cd5a49ee4e942419afd197bc7ee97d68 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期五, 07 六月 2024 11:34:01 +0800
Subject: [PATCH] 工时bug修改+用户过滤10003
---
user-server/src/main/java/com/yuanchu/mom/service/impl/UserServiceImp.java | 23 +++++++++++++----------
1 files changed, 13 insertions(+), 10 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 7e8b4ec..55d622a 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
@@ -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
@@ -64,14 +66,14 @@
map.put("head", PrintChina.printChina(UserPageDto.class));
Map<String, Integer> map1 = getLook.selectPowerByMethodAndUserId("selectUserList");
if (map1.get("look") == 1) user.setCreateUser(map1.get("userId"));
- try{
- if(user.getRoleId()>10000){
- if(user.getRoleId()!=10001){
+ try {
+ if (user.getRoleId() > 10000) {
+ if (user.getRoleId() != 10001) {
List<Integer> ids = roleMapper.getRoleByDepart(user.getRoleId());
user.setRoleId(null);
- map.put("body", userMapper.selectUserDtoPageList(page, QueryWrappers.queryWrappers(user).in("role_id",ids)));
+ map.put("body", userMapper.selectUserDtoPageList(page, QueryWrappers.queryWrappers(user).in("role_id", ids)));
return map;
- }else{
+ } else {
user.setRoleId(null);
map.put("body", userMapper.selectUserDtoPageList(page, QueryWrappers.queryWrappers(user)));
return map;
@@ -79,7 +81,7 @@
}
map.put("body", userMapper.selectUserDtoPageList(page, QueryWrappers.queryWrappers(user).eq("role_id", user.getRoleId())));
return map;
- }catch (NullPointerException e){
+ } catch (NullPointerException e) {
map.put("body", userMapper.selectUserDtoPageList(page, QueryWrappers.queryWrappers(user)));
return map;
}
@@ -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));
@@ -161,9 +164,9 @@
user.setIsCustom(person.getCompanyId().equals("SC2463") ? 0 : 1);
// user.setPassword(DigestUtils.md5DigestAsHex(headerToken.getPassword(person.getEmployeeID()).getBytes()));
user.setPassword(DigestUtils.md5DigestAsHex("123456".getBytes()));
- user.setCompany(BeanUtil.isNotEmpty(custom)?(custom.getId()+""):companyName);
+ user.setCompany(BeanUtil.isNotEmpty(custom) ? (custom.getId() + "") : companyName);
user.setAddress("鏈～鍐�");
- user.setRoleId(personDto.getRoleId()>10000?0:personDto.getRoleId());
+ user.setRoleId(personDto.getRoleId() > 10000 ? 0 : personDto.getRoleId());
user.setCompanyId(person.getCompanyId());
userMapper.insert(user);
} else {
@@ -171,7 +174,7 @@
user.setPhone(person.getPhoneNumber());
user.setEmail(person.getCompanyEmail());
user.setIsCustom(0);
- user.setCompany(BeanUtil.isNotEmpty(custom)?(custom.getId()+""):companyName);
+ user.setCompany(BeanUtil.isNotEmpty(custom) ? (custom.getId() + "") : companyName);
user.setCreateUser(null);
user.setCreateTime(null);
user.setUpdateUser(null);
--
Gitblit v1.9.3