工作台

xuhy

2025-07-01 95d82fe602f478964185bdc75c49abf675d433ee

 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();
    }
}