From ca7e5eec896bb022ccb7e177ca3641e79f5f8554 Mon Sep 17 00:00:00 2001 From: xuhy <3313886187@qq.com> Date: 星期四, 03 七月 2025 23:55:17 +0800 Subject: [PATCH] bug修改 --- ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TAppealController.java | 14 ++++++++++---- 1 files changed, 10 insertions(+), 4 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TAppealController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TAppealController.java index 8e4dc69..66d457d 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TAppealController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TAppealController.java @@ -161,9 +161,11 @@ appealDetailVO.setLocationIcon(byId2.getLocationIcon()); appealDetailVO.setLocationName(byId2.getLocationName()); appealDetailVO.setTaskId(byId.getId()); - SysUser sysUser = sysUserService.selectUserById(Long.valueOf(appeal.getAuditPerson())); - if (sysUser!=null){ - appealDetailVO.setAuditPersonName(sysUser.getUserName()); + if (appeal.getAuditPerson()!=null){ + SysUser sysUser = sysUserService.selectUserById(Long.valueOf(appeal.getAuditPerson())); + if (sysUser!=null){ + appealDetailVO.setAuditPersonName(sysUser.getUserName()); + } } appealDetailVO.setTaskName(byId.getTaskName()); appealDetailVO.setTaskCode(byId.getTaskCode()); @@ -175,7 +177,11 @@ @ApiOperation(value = "审核申诉记录") @PostMapping(value = "/audit") public R<Boolean> audit(@RequestBody @Valid TAppealAuditDTO dto) { - TTask task = taskCleanService.getById(dto.getTaskId()); + TAppeal appeal = appealService.getById(dto.getId()); + dto.setStatus(dto.getStatus()); + dto.setAuditPerson(tokenService.getLoginUser().getUserId()+""); + dto.setAuditTime(LocalDateTime.now()); + TTask task = taskCleanService.getById(appeal.getTaskId()); TLocation location = locationService.getById(task.getLocationId()); TNotice tNotice = new TNotice(); tNotice.setUserId(dto.getAppealPerson()); -- Gitblit v1.7.1