From f72ce39c135c8cea4c39bfda8d7ed8d92a09d7bd Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期二, 02 一月 2024 13:00:19 +0800
Subject: [PATCH] fix 修复 关闭租户功能 三方登录报错问题
---
ruoyi-admin/src/main/java/org/dromara/web/service/SysRegisterService.java | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/ruoyi-admin/src/main/java/org/dromara/web/service/SysRegisterService.java b/ruoyi-admin/src/main/java/org/dromara/web/service/SysRegisterService.java
index 013773e..f38d074 100644
--- a/ruoyi-admin/src/main/java/org/dromara/web/service/SysRegisterService.java
+++ b/ruoyi-admin/src/main/java/org/dromara/web/service/SysRegisterService.java
@@ -1,6 +1,9 @@
package org.dromara.web.service;
import cn.dev33.satoken.secure.BCrypt;
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import lombok.RequiredArgsConstructor;
import org.dromara.common.core.constant.Constants;
import org.dromara.common.core.constant.GlobalConstants;
import org.dromara.common.core.domain.model.RegisterBody;
@@ -14,10 +17,12 @@
import org.dromara.common.core.utils.StringUtils;
import org.dromara.common.log.event.LogininforEvent;
import org.dromara.common.redis.utils.RedisUtils;
+import org.dromara.common.tenant.helper.TenantHelper;
import org.dromara.common.web.config.properties.CaptchaProperties;
+import org.dromara.system.domain.SysUser;
import org.dromara.system.domain.bo.SysUserBo;
+import org.dromara.system.mapper.SysUserMapper;
import org.dromara.system.service.ISysUserService;
-import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
/**
@@ -30,6 +35,7 @@
public class SysRegisterService {
private final ISysUserService userService;
+ private final SysUserMapper userMapper;
private final CaptchaProperties captchaProperties;
/**
@@ -53,7 +59,12 @@
sysUser.setPassword(BCrypt.hashpw(password));
sysUser.setUserType(userType);
- if (!userService.checkUserNameUnique(sysUser)) {
+ boolean exist = TenantHelper.dynamic(tenantId, () -> {
+ return userMapper.exists(new LambdaQueryWrapper<SysUser>()
+ .eq(SysUser::getUserName, sysUser.getUserName())
+ .ne(ObjectUtil.isNotNull(sysUser.getUserId()), SysUser::getUserId, sysUser.getUserId()));
+ });
+ if (exist) {
throw new UserException("user.register.save.error", username);
}
boolean regFlag = userService.registerUser(sysUser, tenantId);
--
Gitblit v1.9.3