From 500a523d545cfe9e6877debbfcd10689619997e4 Mon Sep 17 00:00:00 2001 From: hxh <762326930@qq.com> Date: Mon, 11 Mar 2024 16:14:50 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E8=BF=94=E5=9B=9E=E9=97=AE=E9=A2=98item?= =?UTF-8?q?=E7=9A=84=E5=85=A8=E8=B7=AF=E5=BE=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/kms/yxgh/df/service/DfRecordService.java | 6 +----- .../main/java/com/kms/yxgh/sz/service/SzRecordService.java | 7 +------ 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfRecordService.java b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfRecordService.java index 34a122d6..666eb55f 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfRecordService.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfRecordService.java @@ -68,11 +68,7 @@ public class DfRecordService extends BaseService { .class); if (dto != null) { dto.setParts(items.getOrDefault(r.getId(), Collections.emptyList()) - .stream().map(item -> { - List parts = Arrays.stream(item.getParts().split(PART_SEPARATOR)) - .sorted(Comparator.comparingInt(String::length)).collect(Collectors.toList()); - return parts.get(parts.size() - 1); - }).collect(Collectors.toList())); + .stream().map(DfRecordItem::getParts).collect(Collectors.toList())); dto.setOperatorName(Optional.ofNullable(userService.getWithRedis(r.getCreateUid())).map( SysUser::getNickName).orElse("")); } diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzRecordService.java b/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzRecordService.java index 5e34080a..f8e17376 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzRecordService.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzRecordService.java @@ -67,12 +67,7 @@ public class SzRecordService extends BaseService { .class); if (dto != null) { dto.setParts(items.getOrDefault(r.getId(), Collections.emptyList()) - .stream().map(item -> { - List parts = Arrays.stream(item.getParts().split( - SzCheckingService.PART_SEPARATOR)) - .sorted(Comparator.comparingInt(String::length)).collect(Collectors.toList()); - return parts.get(parts.size() - 1); - }).collect(Collectors.toList())); + .stream().map(SzRecordItem::getParts).collect(Collectors.toList())); dto.setOperatorName(Optional.ofNullable(userService.getWithRedis(r.getCreateUid())).map( SysUser::getNickName).orElse("")); }