From c503c5d336b7219c1bff1f59b4176e4e49f2c3f2 Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期四, 14 十二月 2023 13:50:21 +0800
Subject: [PATCH] 清淤

---
 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java |   20 ++++++++++++++++++--
 1 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java
index 182b371..b82c02f 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java
@@ -7,6 +7,7 @@
 import javax.management.Query;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.ruoyi.common.utils.MessageUtils;
 import org.springframework.stereotype.Service;
 import com.ruoyi.common.annotation.DataSource;
 import com.ruoyi.common.constant.CacheConstants;
@@ -55,7 +56,14 @@
     {
         SysConfig config = new SysConfig();
         config.setConfigId(configId);
-        return configMapper.selectConfig(config);
+        SysConfig sysConfig = configMapper.selectConfig(config);
+        //鍥介檯鍖�
+        String message = MessageUtils.message("config." + sysConfig.getConfigNameI18n());
+        if(StringUtils.isNotEmpty(message))
+        {
+            sysConfig.setConfigName(message);
+        }
+        return sysConfig;
     }
 
     /**
@@ -107,7 +115,15 @@
     @Override
     public List<SysConfig> selectConfigList(SysConfig config)
     {
-        return configMapper.selectConfigList(config);
+        List<SysConfig> sysConfigs = configMapper.selectConfigList(config);
+        //鍥介檯鍖�
+        sysConfigs.stream().forEach(sysConfig -> {
+            String message = MessageUtils.message("config." + sysConfig.getConfigNameI18n());
+            if (StringUtils.isNotEmpty(message)) {
+                sysConfig.setConfigName(message);
+            }
+        });
+        return sysConfigs;
     }
 
     /**

--
Gitblit v1.9.3