From 3ab03bf0e7809b9c0b5fc07b4644412086bc9249 Mon Sep 17 00:00:00 2001
From: Michelle.Chung <1242874891@qq.com>
Date: 星期四, 23 二月 2023 20:31:57 +0800
Subject: [PATCH] fix 修正创建租户失败时未关闭忽略租户问题 ;
---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
index 9c82ff6..a503a98 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
@@ -250,7 +250,7 @@
*/
@Override
public void checkUserAllowed(SysUserBo user) {
- if (ObjectUtil.isNotNull(user.getUserId()) && user.isAdmin()) {
+ if (ObjectUtil.isNotNull(user.getUserId()) && user.isSuperAdmin()) {
throw new ServiceException("涓嶅厑璁告搷浣滆秴绾х鐞嗗憳鐢ㄦ埛");
}
}
@@ -262,7 +262,7 @@
*/
@Override
public void checkUserDataScope(Long userId) {
- if (!LoginHelper.isAdmin()) {
+ if (!LoginHelper.isSuperAdmin()) {
SysUserBo user = new SysUserBo();
user.setUserId(userId);
List<SysUserVo> users = this.selectUserList(user);
@@ -284,6 +284,7 @@
SysUser sysUser = BeanUtil.copyProperties(user, SysUser.class);
// 鏂板鐢ㄦ埛淇℃伅
int rows = baseMapper.insert(sysUser);
+ user.setUserId(sysUser.getUserId());
// 鏂板鐢ㄦ埛宀椾綅鍏宠仈
insertUserPost(user);
// 鏂板鐢ㄦ埛涓庤鑹茬鐞�
@@ -298,10 +299,11 @@
* @return 缁撴灉
*/
@Override
- public boolean registerUser(SysUserBo user) {
+ public boolean registerUser(SysUserBo user, String tenantId) {
user.setCreateBy(user.getUserId());
user.setUpdateBy(user.getUserId());
SysUser sysUser = BeanUtil.copyProperties(user, SysUser.class);
+ sysUser.setTenantId(tenantId);
return baseMapper.insert(sysUser) > 0;
}
@@ -373,7 +375,7 @@
* @return 缁撴灉
*/
@Override
- public boolean updateUserAvatar(String userName, String avatar) {
+ public boolean updateUserAvatar(String userName, Long avatar) {
return baseMapper.update(null,
new LambdaUpdateWrapper<SysUser>()
.set(SysUser::getAvatar, avatar)
--
Gitblit v1.9.3