fix 87786 其他会议-锁定后-编辑年份没有报提示
This commit is contained in:
+8
-3
@@ -343,6 +343,7 @@ public class PayMeetingServiceImpl extends ServiceImpl<PayMeetingMapper, PayMeet
|
||||
PayMeeting payMeeting = getPayMeeting(payMeetingVO, hotelContactsList);
|
||||
saveOrUpdate(payMeeting);
|
||||
String meetingId = payMeeting.getId();
|
||||
//annualDataLockingService.judgeUserYear()
|
||||
// 同步预计到账日期
|
||||
LambdaUpdateWrapper<PayMeetingSituation> upPayMeetingSituation = new LambdaUpdateWrapper<>();
|
||||
upPayMeetingSituation.eq(PayMeetingSituation::getMeetingId, meetingId);
|
||||
@@ -459,9 +460,15 @@ public class PayMeetingServiceImpl extends ServiceImpl<PayMeetingMapper, PayMeet
|
||||
if (id != null) {
|
||||
wrapper.ne(PayMeeting::getId, id);
|
||||
oldMeeting = getById(id);
|
||||
String year = oldMeeting.getParticularYear();
|
||||
//判断用户是否能操作所选年份数据
|
||||
AnnualDataLocking annualDataLocking = annualDataLockingService.judgeUserYear(year);
|
||||
}else {
|
||||
payMeetingVO.setIsRelease(MeetingCommon.REMIND_0);
|
||||
}
|
||||
String year = payMeetingVO.getParticularYear();
|
||||
//判断用户是否能操作所选年份数据
|
||||
AnnualDataLocking annualDataLocking = annualDataLockingService.judgeUserYear(year);
|
||||
if (count(wrapper) > 0) {
|
||||
throw new JeroBootException("会议名称不能重复");
|
||||
}
|
||||
@@ -494,9 +501,7 @@ public class PayMeetingServiceImpl extends ServiceImpl<PayMeetingMapper, PayMeet
|
||||
throw new JeroBootException("会议费用为0时,不可上传收款二维码");
|
||||
}
|
||||
}
|
||||
String year = payMeetingVO.getParticularYear();
|
||||
//判断用户是否能操作所选年份数据
|
||||
AnnualDataLocking annualDataLocking = annualDataLockingService.judgeUserYear(year);
|
||||
|
||||
//根据会议类型进行校验
|
||||
switch (meetingType) {
|
||||
case MeetingCommon.WORKING_GROUP_MEETING:
|
||||
|
||||
Reference in New Issue
Block a user