From f16e46ff33c394b54d65b923ea0e0c20031ce87e Mon Sep 17 00:00:00 2001 From: Bunny <1319900154@qq.com> Date: Sat, 9 Nov 2024 10:08:13 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E8=8F=9C=E5=8D=95=E5=9B=BE=E6=A0=87?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E9=87=8D=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/bunny/services/service/impl/MenuIconServiceImpl.java | 5 +++-- service/src/main/resources/mapper/MenuIconMapper.xml | 1 + 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/service/src/main/java/cn/bunny/services/service/impl/MenuIconServiceImpl.java b/service/src/main/java/cn/bunny/services/service/impl/MenuIconServiceImpl.java index af1e41f..9d2c916 100644 --- a/service/src/main/java/cn/bunny/services/service/impl/MenuIconServiceImpl.java +++ b/service/src/main/java/cn/bunny/services/service/impl/MenuIconServiceImpl.java @@ -21,6 +21,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.util.List; +import java.util.stream.Collectors; /** *

@@ -62,11 +63,11 @@ public class MenuIconServiceImpl extends ServiceImpl i @Override public List getIconNameList(String iconName) { return list(Wrappers.lambdaQuery().like(MenuIcon::getIconName, iconName)) - .stream().map(menuIcon -> { + .stream().collect(Collectors.toMap(MenuIcon::getIconName, menuIcon -> { MenuIconVo menuIconVo = new MenuIconVo(); BeanUtils.copyProperties(menuIcon, menuIconVo); return menuIconVo; - }).toList(); + }, (existing, replacement) -> existing)).values().stream().toList(); } /** diff --git a/service/src/main/resources/mapper/MenuIconMapper.xml b/service/src/main/resources/mapper/MenuIconMapper.xml index 11c8708..741ce5b 100644 --- a/service/src/main/resources/mapper/MenuIconMapper.xml +++ b/service/src/main/resources/mapper/MenuIconMapper.xml @@ -37,6 +37,7 @@ and icon.icon_name like CONCAT('%',#{dto.iconName},'%') + order by update_time desc