From 0fe9dc4501b5735798e99631966839d4aa8f9a84 Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Fri, 20 Oct 2023 18:05:41 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B4=A3=E4=BB=BB=E9=A2=86=E5=9F=9F=E4=B8=80?= =?UTF-8?q?=E7=BA=A7--=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/mapper/SysDictItemMapper.java | 2 +- .../service/impl/SysDictItemServiceImpl.java | 28 +++++++++---------- 2 files changed, 14 insertions(+), 16 deletions(-) diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/SysDictItemMapper.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/SysDictItemMapper.java index 45c415dc5..807763af2 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/SysDictItemMapper.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/SysDictItemMapper.java @@ -26,7 +26,7 @@ public interface SysDictItemMapper extends BaseMapper { @Select("SELECT sys_dict_item.* FROM sys_dict_item LEFT JOIN sys_dict ON sys_dict_item.dict_id = sys_dict.id WHERE DICT_CODE = #{dictCode} order by sys_dict_item.item_text asc") public List selectItemsOrderBySortOrder(String dictCode); - @Select("SELECT sys_dict.dict_code,sys_dict_item.* from sys_dict_item LEFT JOIN sys_dict ON sys_dict_item.dict_id = sys_dict.id where status = 1 and sys_dict_item.del_flag = 0") + @Select("SELECT sys_dict.dict_code,sys_dict_item.* from sys_dict_item LEFT JOIN sys_dict ON sys_dict_item.dict_id = sys_dict.id where status = 1 and sys_dict_item.del_flag = 0 ORDER BY sys_dict_item.sort_order ASC") List selectItemsAll(); /** diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDictItemServiceImpl.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDictItemServiceImpl.java index 09e1f1a81..7c18c1be2 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDictItemServiceImpl.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDictItemServiceImpl.java @@ -2,21 +2,24 @@ package com.jero.modules.system.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.jero.common.constant.CacheConstant; import com.jero.common.constant.CommonConstant; import com.jero.common.constant.enums.CutEnum; -import com.jero.common.system.vo.DictModel; -import com.jero.modules.enums.DictCodeEnum; import com.jero.modules.system.entity.SysDictItem; import com.jero.modules.system.mapper.SysDictItemMapper; import com.jero.modules.system.service.ISysDictItemService; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.cache.annotation.Cacheable; import org.springframework.stereotype.Service; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.Comparator; +import java.util.HashMap; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; import java.util.stream.Collectors; /** @@ -275,16 +278,11 @@ public class SysDictItemServiceImpl extends ServiceImpl> result = null; - if(CollectionUtils.isNotEmpty(sysDictItemByDictCode)){ - result = sysDictItems.stream().filter(sysDict -> { - boolean flag = false; - if (StringUtils.isNotEmpty(sysDict.getStatNode())) { - flag = true; - } - return flag; - }).collect(Collectors.groupingBy(SysDictItem::getStatNode)); + List statNodeList = sysDictItemByDictCode.stream().map(SysDictItem::getStatNode).distinct().collect(Collectors.toList()); + Map> result = new LinkedHashMap<>(); + for (String node : statNodeList) { + List collect = sysDictItemByDictCode.stream().filter(e -> node.equals(e.getStatNode())).collect(Collectors.toList()); + result.put(node,collect); } return result; }