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 b16bd5d..e751da4 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 @@ -80,6 +80,8 @@ public class AttendanceDetailsServiceImpl implements AttendanceDetailsService { @Override public int updateAttDetailsData(List list) { + // 判断考勤修改的数据是否有处于人资审核中,如果只是处于部门领导审核中则可以修改 + int i = attendanceDetailsDao.updateAttDetailsData(list); fileUploadService.saveAttUpdateFileSource(list); if (i > 0) { diff --git a/bonus-modules/bonus-system/src/main/java/com/bonus/system/file/entity/FileSourceVo.java b/bonus-modules/bonus-system/src/main/java/com/bonus/system/file/entity/FileSourceVo.java index c1922c1..680823f 100644 --- a/bonus-modules/bonus-system/src/main/java/com/bonus/system/file/entity/FileSourceVo.java +++ b/bonus-modules/bonus-system/src/main/java/com/bonus/system/file/entity/FileSourceVo.java @@ -39,7 +39,7 @@ public class FileSourceVo { /** * 资源类型(码表进行配置) */ - private String sourceType; + private int sourceType; /** * 创建人 */ diff --git a/bonus-modules/bonus-system/src/main/java/com/bonus/system/file/service/FileUploadServiceImpl.java b/bonus-modules/bonus-system/src/main/java/com/bonus/system/file/service/FileUploadServiceImpl.java index 1517755..ac6448e 100644 --- a/bonus-modules/bonus-system/src/main/java/com/bonus/system/file/service/FileUploadServiceImpl.java +++ b/bonus-modules/bonus-system/src/main/java/com/bonus/system/file/service/FileUploadServiceImpl.java @@ -54,6 +54,7 @@ public class FileUploadServiceImpl implements FileUploadService{ fileSourceVo.setFilePath(vo.getFilePath()); fileSourceVo.setFileType(FileUtils.getFileType(vo.getFileName())); fileSourceVo.setSourceId(bean.getUserId()+"@"+bean.getAttCurrentDay()+"@"+vo.getAttType()); + fileSourceVo.setSourceType(1); fileSourceVo.setCreateUser(SecurityUtils.getUserId()); fileSourceVo.setUpdateUser(SecurityUtils.getUserId()); // 更新图片ID