From a85cb705274d8fbd9f5fba86ff1c39c13ac66de0 Mon Sep 17 00:00:00 2001 From: xiejun <xj@2023> Date: 星期一, 16 十月 2023 17:46:02 +0800 Subject: [PATCH] 1.用户加控制启用,停用状态 2.根据流水依赖获取最大流水值 --- Source/UBCS/ubcs-service/ubcs-desk/src/main/java/com/vci/ubcs/desk/controller/LeaveController.java | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/Source/UBCS/ubcs-service/ubcs-desk/src/main/java/com/vci/ubcs/desk/controller/LeaveController.java b/Source/UBCS/ubcs-service/ubcs-desk/src/main/java/com/vci/ubcs/desk/controller/LeaveController.java index 512c675..9911e8d 100644 --- a/Source/UBCS/ubcs-service/ubcs-desk/src/main/java/com/vci/ubcs/desk/controller/LeaveController.java +++ b/Source/UBCS/ubcs-service/ubcs-desk/src/main/java/com/vci/ubcs/desk/controller/LeaveController.java @@ -24,6 +24,7 @@ import org.springblade.core.boot.ctrl.BladeController; import org.springblade.core.tenant.annotation.NonDS; import org.springblade.core.tool.api.R; +import org.springblade.core.tool.utils.Func; import org.springframework.web.bind.annotation.*; import springfox.documentation.annotations.ApiIgnore; @@ -49,7 +50,9 @@ @GetMapping("detail") public R<ProcessLeave> detail(Long businessId) { ProcessLeave detail = leaveService.getById(businessId); - detail.getFlow().setAssigneeName(UserCache.getUser(detail.getCreateUser()).getName()); + if(Func.isEmpty(detail)){ + detail.getFlow().setAssigneeName(UserCache.getUser(detail.getCreateUser()).getName()); + } return R.data(detail); } -- Gitblit v1.9.3