From 27421a34661fed2e141ab9aaa7447926aea46e36 Mon Sep 17 00:00:00 2001
From: 晏有为 <13214124+yan-youwei@user.noreply.gitee.com>
Date: 星期一, 27 五月 2024 14:09:25 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/center-lims-after
---
user-server/src/main/java/com/yuanchu/mom/service/impl/UserServiceImp.java | 12 +++++++++++-
1 files changed, 11 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 65c305d..a39fae2 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
@@ -68,6 +68,16 @@
}
@Override
+ public Map<String, Object> selectPersonnelOverview(IPage<UserPageDto> page, UserPageDto user) {
+ Map<String, Object> map = new HashMap<>();
+ map.put("head", PrintChina.printChina(UserPageDto.class));
+ Map<String, Integer> map1 = getLook.selectPowerByMethodAndUserId("selectUserList");
+ if (map1.get("look") == 1) user.setCreateUser(map1.get("userId"));
+ map.put("body", userMapper.selectPersonnelOverview(page, QueryWrappers.queryWrappers(user)));
+ return map;
+ }
+
+ @Override
public int updateUser(User user) {
user.setDepartId("1," + user.getDepartId());
return userMapper.updateById(user);
@@ -116,7 +126,7 @@
@Override
@Transactional(rollbackFor = Exception.class)
public int addPersonUser(PersonDto personDto) {
- AtomicReference<String> departId = new AtomicReference<>("");
+ AtomicReference<String> departId = new AtomicReference<>("1,");
AtomicReference<String> companyName = new AtomicReference<>();
personDto.getCompany().forEach(company -> {
Departments department = departmentsMapper.selectOne(Wrappers.<Departments>lambdaQuery().eq(Departments::getCompanyId, company.getCompanyId()));
--
Gitblit v1.9.3