From c0c75703071327c172f9dfbe14f2ca47abfa10a5 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期二, 07 十一月 2023 10:35:57 +0800
Subject: [PATCH] bug列表158（所有规则增加前缀、后缀属性，并在申请编码时进行前后缀拼接）修复；集成系统信息管理，创建修改删除，同步到用户的账号创建、删除、修改操作。
---
Source/UBCS/ubcs-service/ubcs-user/src/main/java/com/vci/ubcs/system/user/service/impl/UserServiceImpl.java | 35 +++++++++++++++++++++++++++++++++++
1 files changed, 35 insertions(+), 0 deletions(-)
diff --git a/Source/UBCS/ubcs-service/ubcs-user/src/main/java/com/vci/ubcs/system/user/service/impl/UserServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-user/src/main/java/com/vci/ubcs/system/user/service/impl/UserServiceImpl.java
index f7418ec..7fbd48d 100644
--- a/Source/UBCS/ubcs-service/ubcs-user/src/main/java/com/vci/ubcs/system/user/service/impl/UserServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-user/src/main/java/com/vci/ubcs/system/user/service/impl/UserServiceImpl.java
@@ -20,6 +20,7 @@
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.vci.ubcs.starter.web.util.VciBaseUtil;
@@ -35,6 +36,7 @@
import com.vci.ubcs.system.user.cache.UserCache;
import com.vci.ubcs.system.user.entity.*;
import com.vci.ubcs.system.user.enums.UserEnum;
+import com.vci.ubcs.system.user.enums.UserStatus;
import com.vci.ubcs.system.user.excel.UserExcel;
import com.vci.ubcs.system.user.mapper.UserMapper;
import com.vci.ubcs.system.user.service.IUserDeptService;
@@ -91,6 +93,9 @@
if (Func.isNotEmpty(user.getPassword())) {
user.setPassword(DigestUtil.encrypt(user.getPassword()));
}
+ if(Func.isEmpty(user.getUserStatus())){
+ user.setUserStatus(UserStatus.Enable.getValue());
+ }
Long userCount = baseMapper.selectCount(Wrappers.<User>query().lambda().eq(User::getTenantId, tenantId).eq(User::getAccount, user.getAccount()));
if (userCount > 0L && Func.isEmpty(user.getId())) {
throw new ServiceException(StringUtil.format("褰撳墠鐢ㄦ埛 [{}] 宸插瓨鍦�!", user.getAccount()));
@@ -142,6 +147,36 @@
return updateById(user);
}
+ /**
+ * 鏍规嵁鏃ц处鍙凤紝淇敼涓烘柊璐﹀彿鍚�
+ * @param oldAccount
+ * @param newAccount
+ * @return
+ */
+ @Override
+ public boolean updateByAccount(String oldAccount,String newAccount) {
+ User user = this.userByAccount(AuthUtil.getTenantId(), oldAccount);
+ if(Func.isEmpty(user)){
+ return true;
+ }
+ user.setAccount(newAccount);
+ return this.updateUser(user);
+ }
+
+ /**
+ * 鎹处鍙凤紝淇敼涓虹敤鎴风姸鎬�
+ * @param accounts
+ * @param status
+ * @return
+ */
+ @Override
+ public boolean updateStatusByAccount(String accounts, String status) {
+ LambdaUpdateWrapper<User> updateWrapper = Wrappers.<User>update()
+ .lambda().in(User::getAccount, accounts)
+ .set(User::getUserStatus, status);
+ return this.update(updateWrapper);
+ }
+
private boolean submitUserDept(User user) {
List<Long> deptIdList = Func.toLongList(user.getDeptId());
List<UserDept> userDeptList = new ArrayList<>();
--
Gitblit v1.9.3