From f8a3a9826738a397bdf4aff4ca7a5116344b5a0a Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期四, 09 五月 2024 07:26:56 +0800
Subject: [PATCH] 实现报告生成合并单元格；修复部分bug
---
user-server/src/main/java/com/yuanchu/mom/service/impl/UserServiceImp.java | 4 +++-
1 files changed, 3 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 5b8d801..351cd81 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
@@ -70,11 +70,13 @@
@Override
public int updateUser(User user) {
+ user.setDepartId("1,"+user.getDepartId());
return userMapper.updateById(user);
}
@Override
public int addUser(User user) {
+ user.setDepartId("1,"+user.getDepartId());
return userMapper.insert(user);
}
@@ -92,7 +94,7 @@
@Override
public User getUserNow() {
Map<String, Integer> map1 = getLook.selectPowerByMethodAndUserId(null);
- return userMapper.selectOne(Wrappers.<User>lambdaQuery().eq(User::getId, map1.get("userId")).eq(User::getIsCustom, 1).select(User::getId, User::getCompany, User::getName, User::getCode));
+ return userMapper.selectOne(Wrappers.<User>lambdaQuery().eq(User::getId, map1.get("userId")).eq(User::getIsCustom, 1).select(User::getId, User::getCompany, User::getName, User::getCode, User::getPhone));
}
@Override
--
Gitblit v1.9.3