From 23b688e436a89845e92d861adb5875e625e90d9f Mon Sep 17 00:00:00 2001 From: zxl <763096477@qq.com> Date: 星期五, 14 三月 2025 11:43:18 +0800 Subject: [PATCH] Merge branch 'dev' --- business/src/main/java/com/ycl/service/impl/HiddenAdminServiceImpl.java | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/business/src/main/java/com/ycl/service/impl/HiddenAdminServiceImpl.java b/business/src/main/java/com/ycl/service/impl/HiddenAdminServiceImpl.java index 356b1d0..d7fc228 100644 --- a/business/src/main/java/com/ycl/service/impl/HiddenAdminServiceImpl.java +++ b/business/src/main/java/com/ycl/service/impl/HiddenAdminServiceImpl.java @@ -16,6 +16,7 @@ import org.springframework.util.Assert; import java.util.ArrayList; +import java.util.Comparator; import java.util.List; import java.util.stream.Collectors; @@ -128,6 +129,7 @@ List<HiddenAdmin> entities = baseMapper.selectList(null); List<HiddenAdminVO> vos = entities.stream() .map(entity -> HiddenAdminVO.getVoByEntity(entity, null)) + .sorted(Comparator.comparing(HiddenAdminVO:: getSort)) .collect(Collectors.toList()); return Result.ok().data(vos); } @@ -135,7 +137,6 @@ @Override public Result updateList(List<HiddenAdminForm> forms) { baseMapper.updateList(forms); -// this.saveBatch(forms); return Result.ok("淇敼鎴愬姛"); } } -- Gitblit v1.8.0