From fab8208b83a3c710cdfc3805655f04f0b7466be5 Mon Sep 17 00:00:00 2001 From: xiejun <xiejun@vci-tech.com> Date: 星期三, 08 一月 2025 11:26:00 +0800 Subject: [PATCH] 产品型号集成,类型转换,人员组织加日志,申请接口引用码段值校验 --- 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