From 5325dfb2fda7bd21bcbcf3c8c10be1ac95793d86 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期一, 05 八月 2024 20:40:48 +0800
Subject: [PATCH] 检验下单的委托人如果制单人的委托单位与选择的委托单位不一致,则委托人必须要进行填写,如果一致那么委托人就默认是制单人+.检验设备第一次进来直接所有样品的这个项目全部使用该设备，第二次修改就只针对当前样品
---
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 55d622a..f47fbe9 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
@@ -163,7 +163,7 @@
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.setPassword(DigestUtils.md5DigestAsHex("zttZTT123!".getBytes()));
user.setCompany(BeanUtil.isNotEmpty(custom) ? (custom.getId() + "") : companyName);
user.setAddress("鏈～鍐�");
user.setRoleId(personDto.getRoleId() > 10000 ? 0 : personDto.getRoleId());
@@ -196,4 +196,9 @@
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();
+ }
}
--
Gitblit v1.9.3