From 3cd7bdde352444cd813f899483ac954c73234e31 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 01 七月 2025 14:44:24 +0800
Subject: [PATCH] 保洁巡检本周代码
---
ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/TUserController.java | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/TUserController.java b/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/TUserController.java
index 3c766c5..597ef3e 100644
--- a/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/TUserController.java
+++ b/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/TUserController.java
@@ -423,6 +423,7 @@
tLeaveAudit.setAvatar(auditPerson.getAvatar());
tLeaveAudit.setNickName(auditPerson.getNickName());
res.setAuditPerson(tLeaveAudit);
+ res.setAuditPersonId("999");
}else if (!sysRole.getRoleName().equals("部门助理")){
// 审批人根据当前角色类型来
if (sysRole.getRoleName().contains("现场负责人")||sysRole.getRoleName().contains("组长")){
@@ -436,6 +437,8 @@
tLeaveAudit.setAvatar(sysUser.getAvatar());
tLeaveAudit.setNickName(sysUser.getNickName());
res.setAuditPerson(tLeaveAudit);
+ res.setAuditPersonId(sysUser.getUserId()+"");
+ break;
}
}
}
@@ -450,6 +453,8 @@
tLeaveAudit.setAvatar(sysUser.getAvatar());
tLeaveAudit.setNickName(sysUser.getNickName());
res.setAuditPerson(tLeaveAudit);
+ res.setAuditPersonId(sysUser.getUserId()+"");
+ break;
}
}
}
@@ -495,6 +500,8 @@
// 生成随机数字6位
String format = simpleDateFormat.format(date);
leaveDTO.setCode(format+ RandomUtil.randomNumbers(6));
+ leaveDTO.setTemplateId(user.getTemplateId());
+ leaveDTO.setLeavePerson(userId+"");
leaveService.save(leaveDTO);
//项目负责人、部门负责人、公司成员提交由最终审批人审批；
if (user.getDeptType()==2 ||sysRole.getRoleName().contains("项目负责人")||sysRole.getRoleName().contains("部门负责人")){
@@ -565,8 +572,9 @@
@ApiOperation(value = "我的审批-详情")
@GetMapping(value = "/leaveDetail")
public R<LeaveUserDetailVO> leaveDetail(@RequestParam String id) {
+ TLeave leave = leaveService.getById(id);
LeaveUserDetailVO leaveUserDetailVO = new LeaveUserDetailVO();
- SysUser sysUser = sysUserService.selectUserById(Long.parseLong(leaveUserDetailVO.getLeavePerson()));
+ SysUser sysUser = sysUserService.selectUserById(Long.parseLong(leave.getLeavePerson()));
Long userRole = sysUserService.getUserRole(sysUser.getUserId());
SysRole sysRole = roleService.selectRoleById(userRole);
if (sysRole.getRoleName().contains("现场负责人")||sysRole.getRoleName().equals("组长")){
@@ -590,7 +598,6 @@
TDept byId = deptService.getById(sysUser.getDeptId());
leaveUserDetailVO.setDeptName(byId.getDeptName());
}
- TLeave leave = leaveService.getById(id);
leaveUserDetailVO.setLeavePersonName(sysUser.getNickName());
LeaveAuditListVO leaveAuditListVO = new LeaveAuditListVO();
List<TLeaveAudit> list = leaveAuditService.list(new LambdaQueryWrapper<TLeaveAudit>()
--
Gitblit v1.7.1