From 9cdcbbccbf4b8752504d11e3379a7156492b07f9 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期一, 11 十一月 2024 10:26:34 +0800
Subject: [PATCH] update 重构 将UserConstants改为SystemConstants 统一常量使用 降低使用难度避免误解
---
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysConfigServiceImpl.java | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysConfigServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysConfigServiceImpl.java
index d1f8248..e8f64ec 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysConfigServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysConfigServiceImpl.java
@@ -7,7 +7,7 @@
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.dromara.common.core.constant.CacheNames;
-import org.dromara.common.core.constant.UserConstants;
+import org.dromara.common.core.constant.SystemConstants;
import org.dromara.common.core.exception.ServiceException;
import org.dromara.common.core.service.ConfigService;
import org.dromara.common.core.utils.MapstructUtils;
@@ -85,9 +85,10 @@
*/
@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));
+ SysConfig retConfig = TenantHelper.dynamic(tenantId, () -> {
+ return baseMapper.selectOne(new LambdaQueryWrapper<SysConfig>()
+ .eq(SysConfig::getConfigKey, "sys.account.registerUser"));
+ });
if (ObjectUtil.isNull(retConfig)) {
return false;
}
@@ -153,6 +154,7 @@
}
row = baseMapper.updateById(config);
} else {
+ CacheUtils.evict(CacheNames.SYS_CONFIG, config.getConfigKey());
row = baseMapper.update(config, new LambdaQueryWrapper<SysConfig>()
.eq(SysConfig::getConfigKey, config.getConfigKey()));
}
@@ -171,12 +173,12 @@
public void deleteConfigByIds(Long[] configIds) {
for (Long configId : configIds) {
SysConfig config = baseMapper.selectById(configId);
- if (StringUtils.equals(UserConstants.YES, config.getConfigType())) {
+ if (StringUtils.equals(SystemConstants.YES, config.getConfigType())) {
throw new ServiceException(String.format("鍐呯疆鍙傛暟銆�%1$s銆戜笉鑳藉垹闄� ", config.getConfigKey()));
}
CacheUtils.evict(CacheNames.SYS_CONFIG, config.getConfigKey());
}
- baseMapper.deleteBatchIds(Arrays.asList(configIds));
+ baseMapper.deleteByIds(Arrays.asList(configIds));
}
/**
--
Gitblit v1.9.3