From 743fc525d63e6590c31f4bd56d90b887da20b6f9 Mon Sep 17 00:00:00 2001
From: yuxc <653031404@qq.com>
Date: 星期三, 02 八月 2023 10:08:40 +0800
Subject: [PATCH] 1、处理了map为空返回null问题。 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