同步前端代码并提交相关修复

ruoyi-common/pom.xml

@@ -35,11 +35,16 @@
             <artifactId>spring-boot-starter-security</artifactId>
         </dependency>
 
-        <!-- pagehelper 分页插件 -->
-        <dependency>
-            <groupId>com.github.pagehelper</groupId>
-            <artifactId>pagehelper-spring-boot-starter</artifactId>
-        </dependency>
+        <!-- pagehelper 分页插件 -->
+        <dependency>
+            <groupId>com.github.pagehelper</groupId>
+            <artifactId>pagehelper-spring-boot-starter</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>mybatis-plus-boot-starter</artifactId>
+        </dependency>
 
         <!-- 自定义验证注解 -->
         <dependency>

ruoyi-common/src/main/java/com/ruoyi/common/utils/DictUtils.java

@@ -39,15 +39,20 @@ public class DictUtils
      * @param key 参数键
      * @return dictDatas 字典数据列表
      */
-    public static List<SysDictData> getDictCache(String key)
-    {
-        JSONArray arrayCache = SpringUtils.getBean(RedisCache.class).getCacheObject(getCacheKey(key));
-        if (StringUtils.isNotNull(arrayCache))
-        {
-            return arrayCache.toList(SysDictData.class);
-        }
-        return null;
-    }
+    public static List<SysDictData> getDictCache(String key)
+    {
+        Object cacheObject = SpringUtils.getBean(RedisCache.class).getCacheObject(getCacheKey(key));
+        if (cacheObject instanceof List)
+        {
+            return (List<SysDictData>) cacheObject;
+        }
+        if (cacheObject instanceof JSONArray)
+        {
+            JSONArray arrayCache = (JSONArray) cacheObject;
+            return arrayCache.toList(SysDictData.class);
+        }
+        return null;
+    }
 
     /**
      * 根据字典类型和字典值获取字典标签

ruoyi-common/src/test/java/com/ruoyi/common/utils/DictUtilsTest.java

@@ -0,0 +1,46 @@
+package com.ruoyi.common.utils;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
+import java.util.Collections;
+import java.util.List;
+import com.ruoyi.common.core.cache.InMemoryCacheStore;
+import com.ruoyi.common.core.domain.entity.SysDictData;
+import com.ruoyi.common.core.redis.RedisCache;
+import com.ruoyi.common.utils.spring.SpringUtils;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.support.DefaultListableBeanFactory;
+import org.springframework.test.util.ReflectionTestUtils;
+
+class DictUtilsTest
+{
+    @AfterEach
+    void tearDown()
+    {
+        ReflectionTestUtils.setField(SpringUtils.class, "beanFactory", null);
+    }
+
+    @Test
+    void shouldReturnDictListWhenCacheStoresArrayList()
+    {
+        DefaultListableBeanFactory beanFactory = new DefaultListableBeanFactory();
+        beanFactory.registerSingleton("redisCache", new RedisCache(new InMemoryCacheStore()));
+        ReflectionTestUtils.setField(SpringUtils.class, "beanFactory", beanFactory);
+
+        SysDictData dictData = new SysDictData();
+        dictData.setDictType("sys_normal_disable");
+        dictData.setDictLabel("正常");
+        dictData.setDictValue("0");
+
+        DictUtils.setDictCache("sys_normal_disable", Collections.singletonList(dictData));
+
+        List<SysDictData> dictCache = DictUtils.getDictCache("sys_normal_disable");
+
+        assertNotNull(dictCache);
+        assertEquals(1, dictCache.size());
+        assertEquals("正常", dictCache.get(0).getDictLabel());
+        assertEquals("0", dictCache.get(0).getDictValue());
+    }
+}