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)){