diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayDataDirectoryController.java b/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayDataDirectoryController.java index caf9693c..41b10bdb 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayDataDirectoryController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayDataDirectoryController.java @@ -144,6 +144,24 @@ public class PayDataDirectoryController extends JeroController addMeetingDataDirectory() { + PayDataDirectory payDataDirectory = new PayDataDirectory(); + payDataDirectory.setType(2); + payDataDirectory.setParentId("0"); + payDataDirectory.setCreateBy("admin"); + payDataDirectory.setSort("0"); + + payDataDirectoryService.save(payDataDirectory); + return Result.OK("添加成功!"); + } /** * 批量删除 diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayDataFileController.java b/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayDataFileController.java index 73eb5288..c753eaa3 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayDataFileController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayDataFileController.java @@ -264,10 +264,12 @@ public class PayDataFileController extends JeroController fileIdList = new ArrayList<>(Arrays.asList(fileIds.split(","))); - fileIdList.remove(oldFileId); + if(fileIdList.contains(oldFileId)&&fileIdList.size()>1){ + fileIdList.remove(oldFileId); + iossFileService.removeById(oldFileId); + } ArrayList list = new ArrayList<>(); stringBuffer = new StringBuffer(); findToTree(dataId, dataType); @@ -393,17 +395,19 @@ public class PayDataFileController extends JeroController distribute( - @RequestParam(name="FileName",required = true) String FileName, + @RequestParam(name="fileId",required = true) String fileId, @RequestParam(name="mails",required = true) String mails ) { StringBuilder stringBuilder = new StringBuilder("会议邮件注意查收"); + OSSFile byId = iossFileService.getById(fileId); + String fileName = byId.getFileName(); EmailSendMsgHandle emailHandle = new EmailSendMsgHandle(); - emailHandle.SendMsgAndFile(mails, stringBuilder.toString(), stringBuilder.toString(), FileName); + emailHandle.SendMsgAndFile(mails, stringBuilder.toString(), stringBuilder.toString(), fileName); return Result.OK("分发成功!"); } @@ -416,17 +420,26 @@ public class PayDataFileController extends JeroController distributes( - @RequestParam(name="FileNameS",required = true) String FileNameS, + @RequestParam(name="fileIds",required = true) String fileIds, @RequestParam(name="mails",required = true) String mails ) { StringBuilder stringBuilder = new StringBuilder("会议邮件注意查收"); EmailSendMsgHandle emailHandle = new EmailSendMsgHandle(); - emailHandle.SendMsgAndFile(mails, stringBuilder.toString(), stringBuilder.toString(), FileNameS); + ArrayList fileList = new ArrayList<>(Arrays.asList(fileIds.split(","))); + StringBuilder stringBuilder1 = new StringBuilder(); + for(String id:fileList){ + OSSFile byId = iossFileService.getById(id); + String fileName = byId.getFileName(); + stringBuilder1.append(fileName+","); + } + int i = stringBuilder1.lastIndexOf(","); + stringBuilder1.deleteCharAt(i); + emailHandle.SendMsgAndFile(mails, stringBuilder.toString(), stringBuilder.toString(), stringBuilder1.toString()); return Result.OK("分发成功!"); }