From 25b19e60e004290531f61fdf608d1adb5e531903 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期六, 12 七月 2025 14:40:12 +0800
Subject: [PATCH] 保洁巡检本周代码
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TLeaveController.java | 19 ++++++++++++++-----
1 files changed, 14 insertions(+), 5 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 1f8e4fd..0efc86d 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
@@ -83,16 +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);
}
}
leaveDetailVO.setList(leaveAuditDetailVOS);
- return R.ok();
+ return R.ok(leaveDetailVO);
}
}
--
Gitblit v1.7.1