|  | @@ -1,6 +1,9 @@
 | 
	
		
			
				|  |  |  package com.ruoyi.system.service.impl;
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  | +import java.util.Comparator;
 | 
	
		
			
				|  |  |  import java.util.List;
 | 
	
		
			
				|  |  | +import java.util.Map;
 | 
	
		
			
				|  |  | +import java.util.stream.Collectors;
 | 
	
		
			
				|  |  |  import javax.annotation.PostConstruct;
 | 
	
		
			
				|  |  |  import org.springframework.beans.factory.annotation.Autowired;
 | 
	
		
			
				|  |  |  import org.springframework.stereotype.Service;
 | 
	
	
		
			
				|  | @@ -135,11 +138,11 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService
 | 
	
		
			
				|  |  |      @Override
 | 
	
		
			
				|  |  |      public void loadingDictCache()
 | 
	
		
			
				|  |  |      {
 | 
	
		
			
				|  |  | -        List<SysDictType> dictTypeList = dictTypeMapper.selectDictTypeAll();
 | 
	
		
			
				|  |  | -        for (SysDictType dictType : dictTypeList)
 | 
	
		
			
				|  |  | -        {
 | 
	
		
			
				|  |  | -            List<SysDictData> dictDatas = dictDataMapper.selectDictDataByType(dictType.getDictType());
 | 
	
		
			
				|  |  | -            DictUtils.setDictCache(dictType.getDictType(), dictDatas);
 | 
	
		
			
				|  |  | +        SysDictData dictData = new SysDictData();
 | 
	
		
			
				|  |  | +        dictData.setStatus("0");
 | 
	
		
			
				|  |  | +        Map<String, List<SysDictData>> dictDataMap = dictDataMapper.selectDictDataList(dictData).stream().collect(Collectors.groupingBy(SysDictData::getDictType));
 | 
	
		
			
				|  |  | +        for (Map.Entry<String, List<SysDictData>> entry: dictDataMap.entrySet()) {
 | 
	
		
			
				|  |  | +            DictUtils.setDictCache(entry.getKey(), entry.getValue().stream().sorted(Comparator.comparing(SysDictData::getDictSort)).collect(Collectors.toList()));
 | 
	
		
			
				|  |  |          }
 | 
	
		
			
				|  |  |      }
 | 
	
		
			
				|  |  |  
 |