Merge remote-tracking branch 'origin/master'

无关风月

23 小时以前 02bb94e413f6950b9786c5ee86c0937bc20f8ae8

 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)
@@ -76,15 +83,25 @@
            LeaveAuditDetailVO leaveAuditDetailVO = new LeaveAuditDetailVO();
            BeanUtils.copyProperties(tLeaveAudit,leaveAuditDetailVO);
            if (tLeaveAudit.getAuditType()==2){
                if (sysUser!=null){
                    leaveAuditDetailVO.setNickName(sysUser.getNickName());
                    leaveAuditDetailVO.setAvatar(sysUser.getPhonenumber());
                for (String s : tLeaveAudit.getAuditId().split(",")) {
                    SysUser sysUser1 = sysUserService.selectUserById(Long.valueOf(s));
                    if (sysUser1!=null){
                        leaveAuditDetailVO.setAvatar(sysUser1.getAvatar());
                        leaveAuditDetailVO.setNickName(sysUser1.getNickName());
                        leaveAuditDetailVOS.add(leaveAuditDetailVO);

                    }
                }
            }else{
                // todo 最终审核人还未确定
                SysUser sysUser1 = sysUserService.selectUserById(Long.valueOf(tLeaveAudit.getAuditId()));
                // 查询审核人
                leaveAuditDetailVO.setNickName(sysUser1.getNickName());
                leaveAuditDetailVO.setAvatar(sysUser1.getAvatar());
                leaveAuditDetailVOS.add(leaveAuditDetailVO);
            }
        }
        return R.ok();
        leaveDetailVO.setList(leaveAuditDetailVOS);
        return R.ok(leaveDetailVO);
    }
}