From b364530ee03f8b28b64863f6a633daf05dc94e91 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期三, 18 十二月 2024 15:55:19 +0800
Subject: [PATCH] 查询站点的检验时长+产量工时bug+检验任务提交撤销+首页待办查最近七天的信息+高低温检验增加检验表字段
---
user-server/src/main/java/com/yuanchu/mom/service/impl/UserServiceImp.java | 7 ++-----
1 files changed, 2 insertions(+), 5 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 f47fbe9..f9545a8 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
@@ -111,10 +111,7 @@
@Override
public List<User> getUserMenu() {
- 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,8 +158,8 @@
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()));
+ //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("鏈～鍐�");
--
Gitblit v1.9.3