From 3d471121d02eb2c31df76a8bd0ef4e5092105756 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A7=9C=E6=B0=B8=E6=98=A5?= Date: Fri, 5 Dec 2025 09:52:40 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=95=B0=E6=8D=AE=E5=AD=97=E5=85=B8?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=E6=8E=A5=E5=8F=A3=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/controller/DictionaryItemController.java | 4 ++-- .../service/impl/DictionaryItemServiceImpl.java | 13 +++++++++---- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/dolphin-modules/dolphin-module-core/src/main/java/day/gitlab/dolphin/module/core/controller/DictionaryItemController.java b/dolphin-modules/dolphin-module-core/src/main/java/day/gitlab/dolphin/module/core/controller/DictionaryItemController.java index 5a91c4d..51fc89d 100644 --- a/dolphin-modules/dolphin-module-core/src/main/java/day/gitlab/dolphin/module/core/controller/DictionaryItemController.java +++ b/dolphin-modules/dolphin-module-core/src/main/java/day/gitlab/dolphin/module/core/controller/DictionaryItemController.java @@ -16,8 +16,8 @@ public class DictionaryItemController { private final DictionaryItemService dictionaryItemService; - @GetMapping("/tree") - public ApiResponse> tree(DictionaryItemDTO record) { + @PostMapping("/tree") + public ApiResponse> tree(@RequestBody DictionaryItemDTO record) { return ApiResponse.success(dictionaryItemService.tree(record.getDictionaryId())); } diff --git a/dolphin-modules/dolphin-module-core/src/main/java/day/gitlab/dolphin/module/core/service/impl/DictionaryItemServiceImpl.java b/dolphin-modules/dolphin-module-core/src/main/java/day/gitlab/dolphin/module/core/service/impl/DictionaryItemServiceImpl.java index ff7269d..9bc3dac 100644 --- a/dolphin-modules/dolphin-module-core/src/main/java/day/gitlab/dolphin/module/core/service/impl/DictionaryItemServiceImpl.java +++ b/dolphin-modules/dolphin-module-core/src/main/java/day/gitlab/dolphin/module/core/service/impl/DictionaryItemServiceImpl.java @@ -23,7 +23,12 @@ public class DictionaryItemServiceImpl implements DictionaryItemService { @Override public List tree(String dictionaryId) { List records = dictionaryItemMapper.findAllByDictionaryId(dictionaryId); - return list2tree(records); + List sortedRecords = records.stream().sorted((item1, item2) -> { + int sort1 = item1.getSort() == null ? 0 : item1.getSort(); + int sort2 = item2.getSort() == null ? 0 : item2.getSort(); + return sort2 - sort1; + }).toList(); + return list2tree(sortedRecords); } @Override @@ -47,10 +52,10 @@ public class DictionaryItemServiceImpl implements DictionaryItemService { } if (record.getSort() == null) { dictionaryItem.setSort(0); + } else { + dictionaryItem.setSort(record.getSort()); } - if (Strings.isNotBlank(record.getDescription())) { - dictionaryItem.setDescription(record.getDescription()); - } + dictionaryItem.setDescription(record.getDescription()); dictionaryItem.setUpdateTime(Timestamp.from(Instant.now())); return dictionaryItemMapper.updateById(dictionaryItem) > 0; }