From b446560ccc97aedde9917db2273c6c6fb8b71acb Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期日, 14 一月 2024 17:05:29 +0800
Subject: [PATCH] 277:参照配置界面，关于包含条件，同一个字段具备多个包含条件时，需要重新设置一下界面更改一下后端查询接口

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