From b11b45122d2b6903e8970e8d55712f7a6a657e22 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期三, 10 一月 2024 00:01:10 +0800
Subject: [PATCH] defaultReferDataGrid接口修改，实现兼容高级查询sql拼接；修改流水处理接口，增加流水处理跳出判断
---
Source/UBCS/ubcs-service/ubcs-desk/src/main/java/com/vci/ubcs/desk/controller/LeaveController.java | 9 ++++++---
1 files changed, 6 insertions(+), 3 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 6554dd5..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
@@ -16,14 +16,15 @@
*/
package com.vci.ubcs.desk.controller;
+import com.vci.ubcs.common.cache.CacheNames;
import com.vci.ubcs.desk.entity.ProcessLeave;
+import com.vci.ubcs.desk.service.ILeaveService;
import com.vci.ubcs.system.user.cache.UserCache;
import lombok.AllArgsConstructor;
-import com.vci.ubcs.common.cache.CacheNames;
import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.tenant.annotation.NonDS;
import org.springblade.core.tool.api.R;
-import com.vci.ubcs.desk.service.ILeaveService;
+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