From ba4280215f219c2ec899e2e4cbb20ab5b6c660e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=96=B9=E4=BA=AE?= Date: Sat, 16 Aug 2025 13:49:46 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BA=BA=E5=91=98=EF=BC=8C=E5=B7=A5?= =?UTF-8?q?=E8=B5=84=E5=8D=A1=EF=BC=8C=E5=90=88=E5=90=8C=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/bonus/bmw/service/impl/PmWorkerServiceImpl.java | 1 - .../java/com/bonus/file/service/impl/FileUtilsServiceImpl.java | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) 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/service/impl/FileUtilsServiceImpl.java b/bonus-modules/bonus-file/src/main/java/com/bonus/file/service/impl/FileUtilsServiceImpl.java index 2b7f0e1..755fe7b 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 @@ -310,7 +310,7 @@ public class FileUtilsServiceImpl { */ public Integer delFileListById(String id, String sourceId, String sourceTable, String sourceType) { List list=mapper.getFileList(id,sourceId,sourceType,sourceTable); - int num=mapper.delFileListBySourceId(id,sourceId,sourceTable,sourceType); + int num=mapper.delFileListBySourceId(id,sourceId,sourceType,sourceTable); if(num>0){ remoteFile(list); } From 924271bf2bfcadae5758eafcc400023a7f8e11d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=96=B9=E4=BA=AE?= Date: Sat, 16 Aug 2025 14:47:42 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BA=BA=E5=91=98=EF=BC=8C=E5=B7=A5?= =?UTF-8?q?=E8=B5=84=E5=8D=A1=EF=BC=8C=E5=90=88=E5=90=8C=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/bonus/file/controller/FileUtilController.java | 2 +- .../main/java/com/bonus/file/mapper/FileUtilMapper.java | 4 ++-- .../com/bonus/file/service/impl/FileUtilsServiceImpl.java | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-) 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 9728acf..790c98e 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 @@ -198,7 +198,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 755fe7b..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,9 +308,9 @@ 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); - int num=mapper.delFileListBySourceId(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); }