From c36bc040d0b6127b08f3f4bccf5d1ae02bf25121 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期五, 31 三月 2023 14:37:10 +0800
Subject: [PATCH] update 优化 角色 sort 值一样的排序问题
---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java | 23 +++++++++++++----------
1 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java
index e935ba2..b64d85d 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java
@@ -16,6 +16,7 @@
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;
@@ -78,17 +79,19 @@
}
/**
- * 鑾峰彇楠岃瘉鐮佸紑鍏�
- *
+ * 鑾峰彇娉ㄥ唽寮�鍏�
+ * @param tenantId 绉熸埛id
* @return true寮�鍚紝false鍏抽棴
*/
@Override
- public boolean selectCaptchaEnabled() {
- String captchaEnabled = SpringUtils.getAopProxy(this).selectConfigByKey("sys.account.captchaEnabled");
- if (StringUtils.isEmpty(captchaEnabled)) {
- return true;
+ 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(captchaEnabled);
+ return Convert.toBool(retConfig.getConfigValue());
}
/**
@@ -190,13 +193,13 @@
* @return 缁撴灉
*/
@Override
- public String checkConfigKeyUnique(SysConfigBo config) {
+ public boolean checkConfigKeyUnique(SysConfigBo config) {
long configId = ObjectUtil.isNull(config.getConfigId()) ? -1L : config.getConfigId();
SysConfig info = baseMapper.selectOne(new LambdaQueryWrapper<SysConfig>().eq(SysConfig::getConfigKey, config.getConfigKey()));
if (ObjectUtil.isNotNull(info) && info.getConfigId() != configId) {
- return UserConstants.NOT_UNIQUE;
+ return false;
}
- return UserConstants.UNIQUE;
+ return true;
}
/**
--
Gitblit v1.9.3