diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingSituationController.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingSituationController.java index 0ae0d5b9..a926926a 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingSituationController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingSituationController.java @@ -452,4 +452,16 @@ public class PayMeetingSituationController extends JeroController setGuestsUploadFile(@RequestBody SetGuestsUploadFileVO setGuestsUploadFileVO) { + payMeetingSituationService.setGuestsUploadFile(setGuestsUploadFileVO,MEETING_TYPE); + return Result.OK("设置嘉宾上传文件成功!"); + } } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java index 242e66ee..29f0fb0f 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java @@ -1914,31 +1914,35 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl meetingSituationIdList = Arrays.asList(meetingSituationIds.split(",")); List payMeetingSituations = this.listByIds(meetingSituationIdList); for (PayMeetingSituation meetingSituation : payMeetingSituations) { - String meetingId1 = meetingSituation.getMeetingId(); - if (!meetingId.equals(meetingId1)){ - throw new JeroBootException("参会人选择错误"); + if (meetingType1 != null){ + String meetingId1 = meetingSituation.getMeetingId(); + if (!meetingId.equals(meetingId1)){ + throw new JeroBootException("参会人选择错误"); + } } //只有嘉宾可以设置 Integer identity = meetingSituation.getIdentity(); diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/SetGuestsUploadFileVO.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/SetGuestsUploadFileVO.java index 90081244..51c063af 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/SetGuestsUploadFileVO.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/SetGuestsUploadFileVO.java @@ -14,7 +14,6 @@ import javax.validation.constraints.NotNull; public class SetGuestsUploadFileVO { /**会议id*/ @ApiModelProperty(value = "会议id") - @NotBlank(message = "会议项目不能为空") private String meetingId; @ApiModelProperty(value = "参会人ids")