From 50faac153f08411556adaa80f9104901d934b5e7 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Mon, 08 Apr 2024 11:13:07 +0800
Subject: [PATCH] 添加事务回滚，userEncipher用户加密类添加空构造函数
---
skjcmanager/skjcmanager-service/skjcmanager-user/src/main/java/cn/gistack/system/user/service/impl/UserServiceImpl.java | 26 +++++++++++++++++++++++---
1 files changed, 23 insertions(+), 3 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-user/src/main/java/cn/gistack/system/user/service/impl/UserServiceImpl.java b/skjcmanager/skjcmanager-service/skjcmanager-user/src/main/java/cn/gistack/system/user/service/impl/UserServiceImpl.java
index a4cea02..2488f49 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-user/src/main/java/cn/gistack/system/user/service/impl/UserServiceImpl.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-user/src/main/java/cn/gistack/system/user/service/impl/UserServiceImpl.java
@@ -32,6 +32,7 @@
import cn.gistack.system.user.excel.UserExcel;
import cn.gistack.system.user.mapper.UserMapper;
import cn.gistack.system.user.service.IUserDeptService;
+import cn.gistack.system.user.service.IUserEncipherService;
import cn.gistack.system.user.service.IUserOauthService;
import cn.gistack.system.user.service.IUserService;
import cn.gistack.system.user.supo.UserSUPO;
@@ -73,6 +74,7 @@
*/
@Service
@AllArgsConstructor
+@Transactional(rollbackFor = Exception.class)
public class UserServiceImpl extends BaseServiceImpl<UserMapper, User> implements IUserService {
private static final String GUEST_NAME = "guest";
@@ -82,6 +84,8 @@
private final BladeTenantProperties tenantProperties;
private final IPwdClient pwdClient;
+
+ private final IUserEncipherService userEncipherService;
@Override
@Transactional(rollbackFor = Exception.class)
@@ -145,10 +149,13 @@
@Override
+ @Transactional(rollbackFor = Exception.class)
public boolean save(User entity) {
//对User进行加密
encryptUserInfo(entity);
- return super.save(entity);
+ boolean saveUser = super.save(entity);
+ boolean saveUserEncipher = userEncipherService.save(new UserEncipher(entity));
+ return saveUserEncipher && saveUser;
}
@Override
@@ -174,11 +181,14 @@
}
@Override
+ @Transactional(rollbackFor = Exception.class)
public boolean updateById(User entity) {
encryptUserInfo(entity);
+ boolean updateUser = super.updateById(entity);
+ boolean updateUserEncipher = userEncipherService.updateById(new UserEncipher(entity));
- return super.updateById(entity);
+ return updateUser&&updateUserEncipher;
}
private boolean submitUserDept(User user) {
@@ -377,11 +387,12 @@
}
@Override
+ @Transactional(rollbackFor = Exception.class)
public boolean removeUser(String userIds) {
if (Func.contains(Func.toLongArray(userIds), AuthUtil.getUserId())) {
throw new ServiceException("不能删除本账号!");
}
- return deleteLogic(Func.toLongList(userIds));
+ return deleteLogic(Func.toLongList(userIds)) && userEncipherService.deleteLogic(Func.toLongList(userIds));
}
@Override
@@ -541,4 +552,13 @@
public List<User> getUserByPhoneIds(String phoneIds) {
return baseMapper.getUserByPhoneIds(phoneIds);
}
+
+ @Override
+ public int getSysUserNum(String adCode) {
+ List<Long> deptIdList = new ArrayList<>();
+ deptIdList = SysCache.getDeptChildIds(Long.parseLong(adCode));
+
+ int number = baseMapper.getSysUserNum(deptIdList);
+ return number;
+ }
}
--
Gitblit v1.9.3