diff --git a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/PmWorkerServiceImpl.java b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/PmWorkerServiceImpl.java index 31b7d67..7c07242 100644 --- a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/PmWorkerServiceImpl.java +++ b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/PmWorkerServiceImpl.java @@ -89,7 +89,6 @@ public class PmWorkerServiceImpl implements PmWorkerService{ int j = mapper.insertEinPro(record); //3.bm_worker_ein_pro_record int k = mapper.insertEinProRecord(record); - //4.pm_user 添加人员登录表 TODO } private void addWorkerWageCardDataAndContract(PmWorker record, List fileMsg) { diff --git a/bonus-modules/bonus-file/src/main/java/com/bonus/file/controller/FileUtilController.java b/bonus-modules/bonus-file/src/main/java/com/bonus/file/controller/FileUtilController.java index 43d2c1e..bf00f31 100644 --- a/bonus-modules/bonus-file/src/main/java/com/bonus/file/controller/FileUtilController.java +++ b/bonus-modules/bonus-file/src/main/java/com/bonus/file/controller/FileUtilController.java @@ -196,7 +196,7 @@ public class FileUtilController { return R.fail("资源表id不能为空"); } } - Integer num= service.delFileListById( id,sourceId,sourceType,sourceTable); + Integer num= service.delFileListById( id,sourceId,sourceTable,sourceType); return R.ok(num); } catch (Exception e) { diff --git a/bonus-modules/bonus-file/src/main/java/com/bonus/file/mapper/FileUtilMapper.java b/bonus-modules/bonus-file/src/main/java/com/bonus/file/mapper/FileUtilMapper.java index 8c18678..12cbf4d 100644 --- a/bonus-modules/bonus-file/src/main/java/com/bonus/file/mapper/FileUtilMapper.java +++ b/bonus-modules/bonus-file/src/main/java/com/bonus/file/mapper/FileUtilMapper.java @@ -34,7 +34,7 @@ public interface FileUtilMapper { * @param sourceTable * @return */ - List getFileList(@Param("id") String id,@Param("sourceId") String sourceId, @Param("sourceType")String sourceType, @Param("sourceTable")String sourceTable); + List getFileList(@Param("id") String id,@Param("sourceId") String sourceId , @Param("sourceTable")String sourceTable, @Param("sourceType")String sourceType); /** * 删除文件集合 @@ -51,7 +51,7 @@ public interface FileUtilMapper { * @param sourceTable * @return */ - int delFileListBySourceId(@Param("id")String id,@Param("sourceId")String sourceId, @Param("sourceType")String sourceType, @Param("sourceTable")String sourceTable); + int delFileListBySourceId(@Param("id")String id,@Param("sourceId")String sourceId, @Param("sourceTable")String sourceTable, @Param("sourceType")String sourceType); /** * 查询数据集合 diff --git a/bonus-modules/bonus-file/src/main/java/com/bonus/file/service/impl/FileUtilsServiceImpl.java b/bonus-modules/bonus-file/src/main/java/com/bonus/file/service/impl/FileUtilsServiceImpl.java index 2b7f0e1..083f3cb 100644 --- a/bonus-modules/bonus-file/src/main/java/com/bonus/file/service/impl/FileUtilsServiceImpl.java +++ b/bonus-modules/bonus-file/src/main/java/com/bonus/file/service/impl/FileUtilsServiceImpl.java @@ -252,7 +252,7 @@ public class FileUtilsServiceImpl { * @return */ public List getFileList(String id, String sourceId, String sourceTable, String sourceType) throws Exception { - List list=mapper.getFileList(id,sourceId,sourceType,sourceTable); + List list=mapper.getFileList(id,sourceId,sourceTable,sourceType); for (UploadFileVo vo:list){ String url=minioUtils.getFileUrl(vo.getBucketName(),vo.getFilePath(),60*60*12); vo.setLsUrl(url); @@ -308,8 +308,8 @@ public class FileUtilsServiceImpl { * @param sourceType * @return */ - public Integer delFileListById(String id, String sourceId, String sourceTable, String sourceType) { - List list=mapper.getFileList(id,sourceId,sourceType,sourceTable); + public Integer delFileListById(String id, String sourceId,String sourceTable,String sourceType) { + List list=mapper.getFileList(id,sourceId,sourceTable,sourceType); int num=mapper.delFileListBySourceId(id,sourceId,sourceTable,sourceType); if(num>0){ remoteFile(list);