From 42df37bb21c42e00aac5be6478cf3bec5d0ca54a Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期二, 01 三月 2022 10:08:09 +0800
Subject: [PATCH] 发布 4.0.1 大升级 4.X 之后第一个修复版本
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
index 5194046..c3ff6f4 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
@@ -10,7 +10,6 @@
import com.ruoyi.common.core.domain.entity.SysRole;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.core.page.TableDataInfo;
-import com.ruoyi.common.core.service.UserService;
import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.helper.LoginHelper;
import com.ruoyi.common.utils.StringUtils;
@@ -38,7 +37,7 @@
@Slf4j
@RequiredArgsConstructor
@Service
-public class SysUserServiceImpl implements ISysUserService, UserService {
+public class SysUserServiceImpl implements ISysUserService {
private final SysUserMapper baseMapper;
private final SysRoleMapper roleMapper;
@@ -207,7 +206,7 @@
*/
@Override
public void checkUserDataScope(Long userId) {
- if (!SysUser.isAdmin(LoginHelper.getUserId())) {
+ if (!LoginHelper.isAdmin()) {
SysUser user = new SysUser();
user.setUserId(userId);
List<SysUser> users = SpringUtils.getAopProxy(this).selectUserList(user);
@@ -243,6 +242,8 @@
*/
@Override
public boolean registerUser(SysUser user) {
+ user.setCreateBy(user.getUserName());
+ user.setUpdateBy(user.getUserName());
return baseMapper.insert(user) > 0;
}
@@ -437,6 +438,7 @@
public int deleteUserByIds(Long[] userIds) {
for (Long userId : userIds) {
checkUserAllowed(new SysUser(userId));
+ checkUserDataScope(userId);
}
List<Long> ids = Arrays.asList(userIds);
// 鍒犻櫎鐢ㄦ埛涓庤鑹插叧鑱�
--
Gitblit v1.9.3