From 9faf2a277fed27b40bbd523385c51cb8bd59c92b Mon Sep 17 00:00:00 2001 From: xudawei Date: Fri, 14 Feb 2025 18:23:11 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20(REQ-3300)=20=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E9=A1=B5=E6=8C=89=E9=92=AE=E6=94=BE=E5=BC=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../visa/api/response/VisaDetailByIdResponse.java | 13 +++++++++++-- .../server/controller/ChangeRecordController.java | 4 ++-- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/visa/visa-api/src/main/java/cn/axzo/nanopart/visa/api/response/VisaDetailByIdResponse.java b/visa/visa-api/src/main/java/cn/axzo/nanopart/visa/api/response/VisaDetailByIdResponse.java index 3dec4078..6ad2d56f 100644 --- a/visa/visa-api/src/main/java/cn/axzo/nanopart/visa/api/response/VisaDetailByIdResponse.java +++ b/visa/visa-api/src/main/java/cn/axzo/nanopart/visa/api/response/VisaDetailByIdResponse.java @@ -357,7 +357,12 @@ public class VisaDetailByIdResponse { if (CollectionUtils.isEmpty(professionalList)) { return Lists.newArrayList(); } - return professionalList; + + List filter = professionalList.stream().filter(item -> Objects.nonNull(item) && StringUtils.isNotBlank(item.getCode())).collect(Collectors.toList()); + if (CollectionUtils.isEmpty(filter)) { + return Lists.newArrayList(); + } + return filter; } /** @@ -407,7 +412,11 @@ public class VisaDetailByIdResponse { if (CollectionUtils.isEmpty(relationAreaList)) { return Lists.newArrayList(); } - return relationAreaList; + List filter = relationAreaList.stream().filter(item -> Objects.nonNull(item) && Objects.nonNull(item.getAreaId())).collect(Collectors.toList()); + if (CollectionUtils.isEmpty(filter)) { + return Lists.newArrayList(); + } + return filter; } public static List buildAreaWithId(JSONArray relationArea) { diff --git a/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/controller/ChangeRecordController.java b/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/controller/ChangeRecordController.java index 73a78bfe..11e5c782 100644 --- a/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/controller/ChangeRecordController.java +++ b/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/controller/ChangeRecordController.java @@ -87,8 +87,8 @@ public class ChangeRecordController implements ChangeRecordApi { @Override public ApiResult visaDetailById(@RequestBody @Valid VisaDetailByIdRequest req) { VisaDetailByIdResponse resp = changeRecordService.detailById(req.getVisaId()); - resp.setBtnList(VisaButtonTypeEnum.all()); -// resp.setBtnList(changeRecordConfirmService.fetchBtnsByCondition(req.getVisaId(), req.getPersonId(), req.getOuId(), req.getWorkspaceId(), resp.getStatus())); +// resp.setBtnList(VisaButtonTypeEnum.all()); + resp.setBtnList(changeRecordConfirmService.fetchBtnsByCondition(req.getVisaId(), req.getPersonId(), req.getOuId(), req.getWorkspaceId(), resp.getStatus())); return ApiResult.ok(resp); }