From ff07f3bbbae77b6b32f13abf4fde5516a9cfc049 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期二, 01 七月 2025 17:22:50 +0800
Subject: [PATCH] 工作台
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TLeaveController.java | 20 ++++++++++++++------
1 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TLeaveController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TLeaveController.java
index 16461fa..1f8e4fd 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TLeaveController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TLeaveController.java
@@ -58,15 +58,22 @@
leaveDetailVO.setPhone(sysUser.getPhonenumber());
if (sysUser.getDeptType() == 1){
TProjectDept tProjectDept = projectDeptService.getById(sysUser.getDeptId());
- if (!tProjectDept.getParentId().equals("0")){
- TProjectDept tProjectDept1 = projectDeptService.getById(tProjectDept.getParentId());
- leaveDetailVO.setDeptName(tProjectDept1.getProjectName()+">"+tProjectDept.getProjectName());
- }else{
- leaveDetailVO.setDeptName(tProjectDept.getProjectName());
+ if(tProjectDept!=null){
+ if (!tProjectDept.getParentId().equals("0")){
+ TProjectDept tProjectDept1 = projectDeptService.getById(tProjectDept.getParentId());
+ if (tProjectDept1!=null){
+ leaveDetailVO.setDeptName(tProjectDept1.getProjectName()+">"+tProjectDept.getProjectName());
+ }
+ }else{
+ leaveDetailVO.setDeptName(tProjectDept.getProjectName());
+ }
}
+
}else{
TDept tDept = deptService.getById(sysUser.getDeptId());
- leaveDetailVO.setDeptName(tDept.getDeptName());
+ if (tDept!=null){
+ leaveDetailVO.setDeptName(tDept.getDeptName());
+ }
}
}
List<TLeaveAudit> list = leaveAuditService.lambdaQuery().eq(TLeaveAudit::getLeaveId, id)
@@ -84,6 +91,7 @@
// todo 最终审核人还未确定
}
}
+ leaveDetailVO.setList(leaveAuditDetailVOS);
return R.ok();
}
}
--
Gitblit v1.7.1