From 087991c76f078defe5eb55d84223021b4199fb3d Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期一, 17 二月 2025 11:22:50 +0800
Subject: [PATCH] 设备模块修改bug
---
user-server/src/main/java/com/yuanchu/mom/service/impl/UserServiceImp.java | 73 +++++++++++++++++++++++++++---------
1 files changed, 54 insertions(+), 19 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 870d737..e279621 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;
@@ -13,6 +14,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 +28,8 @@
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.function.Consumer;
+import java.util.stream.Collectors;
@Service
public class UserServiceImp implements UserService {
@@ -62,20 +66,25 @@
map.put("head", PrintChina.printChina(UserPageDto.class));
Map<String, Integer> map1 = getLook.selectPowerByMethodAndUserId("selectUserList");
if (map1.get("look") == 1) user.setCreateUser(map1.get("userId"));
- 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)));
- return map;
- }else{
- user.setRoleId(null);
- map.put("body", userMapper.selectUserDtoPageList(page, QueryWrappers.queryWrappers(user)));
- return map;
+ 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)));
+ return map;
+ } else {
+ user.setRoleId(null);
+ map.put("body", userMapper.selectUserDtoPageList(page, QueryWrappers.queryWrappers(user)));
+ return map;
+ }
}
+ map.put("body", userMapper.selectUserDtoPageList(page, QueryWrappers.queryWrappers(user).eq("role_id", user.getRoleId())));
+ return map;
+ } catch (NullPointerException e) {
+ map.put("body", userMapper.selectUserDtoPageList(page, QueryWrappers.queryWrappers(user)));
+ return map;
}
- map.put("body", userMapper.selectUserDtoPageList(page, QueryWrappers.queryWrappers(user).eq("role_id", user.getRoleId())));
- return map;
}
@Override
@@ -102,7 +111,8 @@
@Override
public List<User> getUserMenu() {
- return userMapper.selectList(Wrappers.<User>lambdaQuery().eq(User::getState, 1).select(User::getName, User::getId));
+ return userMapper.selectList(Wrappers.<User>lambdaQuery()
+ .eq(User::getState, 1).select(User::getName, User::getId));
}
//鑾峰彇璁惧璐熻矗浜�
@@ -148,23 +158,25 @@
user.setAccount(person.getEmployeeID());
user.setPhone(person.getPhoneNumber());
user.setEmail(person.getCompanyEmail());
- 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);
+ //todo 鏍规嵁瀹㈡埛鍏徃鐨勭紪鍙疯�屾敼鍙�
+ user.setIsCustom(person.getCompanyId().equals("SC2301") ? 0 : 1);
+ user.setPassword(DigestUtils.md5DigestAsHex("zttZTT123!".getBytes()));
+ 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 {
user.setName(person.getName());
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);
user.setUpdateTime(null);
+ user.setCompanyId(person.getCompanyId());
userMapper.updateById(user);
}
});
@@ -181,4 +193,27 @@
public int delUserDepardLimsId(Integer id) {
return userMapper.update(null, Wrappers.<User>lambdaUpdate().eq(User::getId, id).set(User::getDepartLimsId, null).set(User::getUpdateTime, LocalDateTime.now()).set(User::getUpdateUser, getLook.selectPowerByMethodAndUserId(null).get("userId")));
}
+
+ @Override
+ public List<User> getUser() {
+ return userMapper.getUser();
+ }
+
+ /**
+ * 鑾峰彇褰撳墠鐧诲綍鐢ㄦ埛閮ㄩ棬
+ * @return
+ */
+ @Override
+ public String selectUserDepartmentLimsName() {
+ return userMapper.selectUserDepartmentLimsName(getLook.selectPowerByMethodAndUserId(null).get("userId"));
+ }
+
+ /**
+ * 鑾峰彇褰撳墠鐧诲綍鐢ㄦ埛閮ㄩ棬涓嬬殑鎵�鏈夌敤鎴�
+ * @return
+ */
+ @Override
+ public List<User> selectDepartmentLimsUserList() {
+ return userMapper.selectDepartmentLimsUserList(getLook.selectPowerByMethodAndUserId(null).get("userId"));
+ }
}
--
Gitblit v1.9.3