From 08a962d2925baa255207fdf979e6fee794f1773b Mon Sep 17 00:00:00 2001
From: ke <893754509@qq.com>
Date: Fri, 19 Jul 2024 12:25:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev
---
skjcmanager/skjcmanager-service/skjcmanager-user/src/main/java/cn/gistack/system/user/service/impl/UserServiceImpl.java | 20 +++++++++++++++-----
1 files changed, 15 insertions(+), 5 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 539467f..2b93180 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
@@ -74,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";
@@ -207,17 +208,22 @@
* 自定义分页查询
* @param page
* @param user
- * @param deptId
+ * @param deptIds
* @param tenantId
* @return
*/
@Override
- public IPage<UserVO> selectUserPage(IPage<UserVO> page, UserVO user, Long deptId, String tenantId) {
+ public IPage<UserVO> selectUserPage(IPage<UserVO> page, UserVO user, String deptIds, String tenantId) {
List<Long> deptIdList = new ArrayList<>();
+ String [] deptidsStr = deptIds.split(",");
if (null!=user.getIsDept()) {
- deptIdList.add(deptId);
+ for (String str:deptidsStr) {
+ deptIdList.add(Long.parseLong(str));
+ }
}else {
- deptIdList = SysCache.getDeptChildIds(deptId);
+ for (String str:deptidsStr) {
+ deptIdList.addAll(SysCache.getDeptChildIds(Long.parseLong(str)));
+ }
}
return page.setRecords(baseMapper.selectUserPage(page, user, deptIdList, tenantId));
}
@@ -386,6 +392,7 @@
}
@Override
+ @Transactional(rollbackFor = Exception.class)
public boolean removeUser(String userIds) {
if (Func.contains(Func.toLongArray(userIds), AuthUtil.getUserId())) {
throw new ServiceException("不能删除本账号!");
@@ -410,6 +417,7 @@
if (!AuthUtil.isAdministrator() || StringUtil.isBlank(user.getTenantId())) {
user.setTenantId(AuthUtil.getTenantId());
}
+ user.setType(userExcel.getType());
// 覆盖数据
if (isCovered) {
// 查询用户是否存在
@@ -421,7 +429,9 @@
}
}
// 获取默认密码配置
- String initPassword = ParamCache.getValue(DEFAULT_PARAM_PASSWORD);
+// String initPassword = ParamCache.getValue(DEFAULT_PARAM_PASSWORD);
+
+ String initPassword = CommonConstant.DEFAULT_PASSWORD;
user.setPassword(initPassword);
this.submit(user);
});
--
Gitblit v1.9.3