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; }