From 5f0e4e81f09720335d9216b6de57a3746fc92025 Mon Sep 17 00:00:00 2001 From: 疯狂的狮子Li <15040126243@163.com> Date: 星期四, 20 一月 2022 17:13:54 +0800 Subject: [PATCH] !131 fix 修改用户信息校验方法 Merge pull request !131 from KonBAI/fix_cheakUserInfo --- ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java | 21 ++++++++++++--------- 1 files changed, 12 insertions(+), 9 deletions(-) diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java index 5c941aa..9e4ceec 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java @@ -21,10 +21,8 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import java.util.Arrays; -import java.util.Collection; -import java.util.List; -import java.util.Map; +import java.util.*; +import java.util.stream.Collectors; /** * 瀛楀吀 涓氬姟灞傚鐞� @@ -144,11 +142,16 @@ */ @Override public void loadingDictCache() { - List<SysDictType> dictTypeList = baseMapper.selectList(); - for (SysDictType dictType : dictTypeList) { - List<SysDictData> dictDatas = dictDataMapper.selectDictDataByType(dictType.getDictType()); - RedisUtils.setCacheObject(getCacheKey(dictType.getDictType()), dictDatas); - } + List<SysDictData> dictDataList = dictDataMapper.selectList( + new LambdaQueryWrapper<SysDictData>().eq(SysDictData::getStatus, "0")); + Map<String, List<SysDictData>> dictDataMap = dictDataList.stream().collect(Collectors.groupingBy(SysDictData::getDictType)); + dictDataMap.forEach((k,v) -> { + String dictKey = getCacheKey(k); + List<SysDictData> dictList = v.stream() + .sorted(Comparator.comparing(SysDictData::getDictSort)) + .collect(Collectors.toList()); + RedisUtils.setCacheObject(dictKey, dictList); + }); } /** -- Gitblit v1.9.3