admin/lx-admin-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

!304 fix 修复多租户下注册用户BUG

Browse Source 
Merge pull request !304 from Yjoioooo/5.X
This commit is contained in:
疯狂的狮子Li 2023-03-09 13:57:17 +00:00 committed by Gitee
commit 6a813c0e41
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
3 changed files with 25 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi-admin/src/main/java/com/ruoyi/web/controller/SysRegisterController.java
View File

@ -31,7 +31,7 @@ public class SysRegisterController extends BaseController {
@SaIgnore
@PostMapping("/register")
public R<Void> register(@Validated @RequestBody RegisterBody user) {
if (!("true".equals(configService.selectConfigByKey("sys.account.registerUser")))) {
if (!configService.selectRegisterEnabled(user.getTenantId())) {
return R.fail("当前系统没有开启注册功能！");
}
registerService.register(user);

7
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysConfigService.java
View File

@ -33,6 +33,13 @@ public interface ISysConfigService {
*/
String selectConfigByKey(String configKey);
/**
* 获取注册开关
* @param tenantId 租户id
* @return true开启，false关闭
*/
boolean selectRegisterEnabled(String tenantId);
/**
* 获取验证码开关
*

17
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java
View File

@ -16,6 +16,7 @@ import com.ruoyi.common.core.utils.StringUtils;
import com.ruoyi.common.mybatis.core.page.PageQuery;
import com.ruoyi.common.mybatis.core.page.TableDataInfo;
import com.ruoyi.common.redis.utils.CacheUtils;
import com.ruoyi.common.tenant.helper.TenantHelper;
import com.ruoyi.system.domain.SysConfig;
import com.ruoyi.system.domain.bo.SysConfigBo;
import com.ruoyi.system.domain.vo.SysConfigVo;
@ -77,6 +78,22 @@ public class SysConfigServiceImpl implements ISysConfigService, ConfigService {
return StringUtils.EMPTY;
}
/**
* 获取注册开关
* @param tenantId 租户id
* @return true开启，false关闭
*/
@Override
public boolean selectRegisterEnabled(String tenantId) {
SysConfig retConfig = baseMapper.selectOne(new LambdaQueryWrapper<SysConfig>()
.eq(SysConfig::getConfigKey, "sys.account.registerUser")
.eq(TenantHelper.isEnable(),SysConfig::getTenantId, tenantId));
if (ObjectUtil.isNull(retConfig)) {
return false;
}
return Convert.toBool(retConfig.getConfigValue());
}
/**
* 获取验证码开关
*