From e86765c6bc716f566738d7b2d9e309cbd5b25e87 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期五, 28 七月 2023 13:53:05 +0800
Subject: [PATCH] * update springboot 3.0.8 => 3.1.2 * update spring-mybatis 3.0.1 => 3.0.2 * update easyexcel 3.3.1 => 3.3.2 * update hutool 5.8.18 => 5.8.20 * update redisson 3.20.1 => 3.23.1 * update dynamic-ds 4.1.1 => 4.1.2 * update mapstruct-plus 1.3.1 => 1.3.5 * update aws-java-sdk-s3 1.12.400 => 1.12.517 * update maven-surefire-plugin 3.0.0 => 3.1.2
---
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDictTypeServiceImpl.java | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDictTypeServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDictTypeServiceImpl.java
index 60431ec..d0e9562 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDictTypeServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDictTypeServiceImpl.java
@@ -123,7 +123,6 @@
* @param dictType 瀛楀吀绫诲瀷
* @return 瀛楀吀绫诲瀷
*/
- @Cacheable(cacheNames = CacheNames.SYS_DICT, key = "#dictType")
@Override
public SysDictTypeVo selectDictTypeByType(String dictType) {
return baseMapper.selectVoById(new LambdaQueryWrapper<SysDictType>().eq(SysDictType::getDictType, dictType));
@@ -163,10 +162,11 @@
*/
@CachePut(cacheNames = CacheNames.SYS_DICT, key = "#bo.dictType")
@Override
- public List<SysDictTypeVo> insertDictType(SysDictTypeBo bo) {
+ public List<SysDictDataVo> insertDictType(SysDictTypeBo bo) {
SysDictType dict = MapstructUtils.convert(bo, SysDictType.class);
int row = baseMapper.insert(dict);
if (row > 0) {
+ // 鏂板 type 涓嬫棤 data 鏁版嵁 杩斿洖绌洪槻姝㈢紦瀛樼┛閫�
return new ArrayList<>();
}
throw new ServiceException("鎿嶄綔澶辫触");
@@ -265,4 +265,10 @@
}
}
+ @Override
+ public Map<String, String> getAllDictByDictType(String dictType) {
+ List<SysDictDataVo> list = selectDictDataByType(dictType);
+ return StreamUtils.toMap(list, SysDictDataVo::getDictValue, SysDictDataVo::getDictLabel);
+ }
+
}
--
Gitblit v1.9.3