From df13f27e9cae2d7b112ef0dda85cba456ecef32b Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期三, 26 二月 2025 16:45:09 +0800
Subject: [PATCH] 远场和近场的数据解析的单位和指标需要重新对应+报告生成放在复核结束里面
---
user-server/src/main/java/com/yuanchu/mom/service/impl/UserServiceImp.java | 30 +++++++++++++++++++++++++-----
1 files changed, 25 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 6dcc77e..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
@@ -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("鏈～鍐�");
@@ -196,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