From 368fb1f49bb2b22b099ddad89bf41482b03add7b Mon Sep 17 00:00:00 2001 From: cwchen <1048842385@qq.com> Date: Thu, 20 Feb 2025 20:15:26 +0800 Subject: [PATCH] =?UTF-8?q?=E8=80=83=E5=8B=A4=E4=BF=AE=E6=94=B9=20?= =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E6=B5=81=E7=A8=8B=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/att/service/AttendanceDetailsServiceImpl.java | 7 ++++++- .../system/evection/controller/EvectionController.java | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/bonus-modules/bonus-system/src/main/java/com/bonus/system/att/service/AttendanceDetailsServiceImpl.java b/bonus-modules/bonus-system/src/main/java/com/bonus/system/att/service/AttendanceDetailsServiceImpl.java index 8300712..ba89402 100644 --- a/bonus-modules/bonus-system/src/main/java/com/bonus/system/att/service/AttendanceDetailsServiceImpl.java +++ b/bonus-modules/bonus-system/src/main/java/com/bonus/system/att/service/AttendanceDetailsServiceImpl.java @@ -163,7 +163,12 @@ public class AttendanceDetailsServiceImpl implements AttendanceDetailsService { // } // } // } - return attendanceDetailsDao.selectAttUpdateList(bean); + List list = attendanceDetailsDao.selectAttUpdateList(bean); + for (AttDataDetailsBean vo : list) { + List filesVoList = fileUploadService.getFiles(vo); + vo.setFilesVoList(filesVoList); + } + return list; } @Override diff --git a/bonus-modules/bonus-system/src/main/java/com/bonus/system/evection/controller/EvectionController.java b/bonus-modules/bonus-system/src/main/java/com/bonus/system/evection/controller/EvectionController.java index a143852..4d3aa40 100644 --- a/bonus-modules/bonus-system/src/main/java/com/bonus/system/evection/controller/EvectionController.java +++ b/bonus-modules/bonus-system/src/main/java/com/bonus/system/evection/controller/EvectionController.java @@ -146,7 +146,7 @@ public class EvectionController extends BaseController { @Log(title = "流程管理->出差报备->修改出差报备", businessType = BusinessType.UPDATE) public AjaxResult edit(@Validated @RequestBody EvectionBean o) { try{ - AjaxResult result = isCheck(o.getId() + "",1); + AjaxResult result = isCheck(o.getUuid() + "",2); if(result!=null){ return result; }