From 931c37dfbf5dcfc8c9fbde705b556d6538309260 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=BE=BE=E5=AF=8C=E6=96=8C?= Date: Sun, 7 Sep 2025 12:57:52 +0800 Subject: [PATCH] =?UTF-8?q?fix=20(farm):=20=E7=89=A9=E7=A7=8D=E5=BA=93?= =?UTF-8?q?=E7=BB=B4=E6=8A=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 分页查询重复bug --- .../specieslibrary/SpeciesLibraryServiceImpl.java | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/specieslibrary/SpeciesLibraryServiceImpl.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/specieslibrary/SpeciesLibraryServiceImpl.java index 3d30873a..b1cdceeb 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/specieslibrary/SpeciesLibraryServiceImpl.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/specieslibrary/SpeciesLibraryServiceImpl.java @@ -397,7 +397,7 @@ public class SpeciesLibraryServiceImpl implements SpeciesLibraryService { } // 构建完整的树结构用于查询 - List fullTree = buildTree(allDicts); + List fullTree = buildTree(matchedDicts); Set resultIds = new HashSet<>(); List result = new ArrayList<>(); @@ -419,7 +419,16 @@ public class SpeciesLibraryServiceImpl implements SpeciesLibraryService { } } - return result; + return result.stream() + .collect(Collectors.collectingAndThen( + Collectors.toMap( + SpeciesTwoLevelTreeRespVO::getName, + item -> item, + (existing, replacement) -> existing, // 保留第一个出现的 + LinkedHashMap::new + ), + map -> new ArrayList<>(map.values()) + )); } /**