From 64bec6de50de62e75ec348fa37b9f036059d7603 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Thu, 10 Nov 2022 11:20:45 +0800 Subject: [PATCH] =?UTF-8?q?fix=20=E6=94=B6=E5=85=A5=E6=94=AF=E5=87=BA?= =?UTF-8?q?=E5=90=88=E5=90=8C=EF=BC=8C=E6=AD=A3=E7=A1=AE=E5=9B=9E=E6=98=BE?= =?UTF-8?q?=E5=AD=98=E6=A1=A3=E5=92=8C=E5=AE=A1=E6=A0=B8=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E4=B8=AD=E7=9A=84=E4=BA=BA=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/PayIncomeContractController.java | 14 ++++++++++++++ .../controller/PaySpendingContractController.java | 14 ++++++++++++++ 2 files changed, 28 insertions(+) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PayIncomeContractController.java b/jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PayIncomeContractController.java index 9a281f63..a9de5997 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PayIncomeContractController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PayIncomeContractController.java @@ -599,8 +599,22 @@ public class PayIncomeContractController extends JeroControllerObjects.equals(p.getContractStatus(), PayIncomeContractCommon.STATUS5)).collect(Collectors.toList()); + listArchive.forEach(p -> { + String name = p.getCreateBy(); + LoginUser user = sysBaseAPI.getUserByName(name); + if (user != null){ + p.setCreateBy(user.getRealname()); + } + }); // 获取审核记录 listAudit = listAll.stream().filter(p->!Objects.equals(p.getContractStatus(), PayIncomeContractCommon.STATUS5)).collect(Collectors.toList()); + listAudit.forEach(p -> { + String name = p.getCreateBy(); + LoginUser user = sysBaseAPI.getUserByName(name); + if (user != null){ + p.setCreateBy(user.getRealname()); + } + }); } String str = JSON.toJSONString(payIncomeContract); diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PaySpendingContractController.java b/jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PaySpendingContractController.java index da00b3ec..05d2ea7b 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PaySpendingContractController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PaySpendingContractController.java @@ -310,8 +310,22 @@ public class PaySpendingContractController extends JeroControllerObjects.equals(p.getContractStatus(), PayIncomeContractCommon.STATUS5)).collect(Collectors.toList()); + listArchive.forEach(p -> { + String name = p.getCreateBy(); + LoginUser user = sysBaseAPI.getUserByName(name); + if (user != null){ + p.setCreateBy(user.getRealname()); + } + }); // 获取审核记录 listAudit = listAll.stream().filter(p->!Objects.equals(p.getContractStatus(), PayIncomeContractCommon.STATUS5)).collect(Collectors.toList()); + listAudit.forEach(p -> { + String name = p.getCreateBy(); + LoginUser user = sysBaseAPI.getUserByName(name); + if (user != null){ + p.setCreateBy(user.getRealname()); + } + }); } if(!CollectionUtils.isEmpty(listArchive)){