| | |
| | | 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); |
| | | } |
| | | } |
| | | leaveDetailVO.setList(leaveAuditDetailVOS); |
| | | return R.ok(); |
| | | return R.ok(leaveDetailVO); |
| | | } |
| | | } |
| | | |