fix 会员会议编辑

This commit is contained in:
lijiarao
2022-01-05 17:25:13 +08:00
parent 4875c14ef8
commit 555a7b10c5
@@ -318,8 +318,10 @@ public class PayMeetingServiceImpl extends ServiceImpl<PayMeetingMapper, PayMeet
LambdaQueryWrapper<PayMeeting> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(PayMeeting::getMeetingName, meetingName);
String id = payMeetingVO.getId();
PayMeeting oldMeeting = null;
if (id != null) {
wrapper.ne(PayMeeting::getId, id);
oldMeeting = getById(id);
}else {
payMeetingVO.setIsRelease(MeetingCommon.REMIND_0);
}
@@ -370,10 +372,10 @@ public class PayMeetingServiceImpl extends ServiceImpl<PayMeetingMapper, PayMeet
throw new JeroBootException("标协会议类型不存在");
}
payMeeting.setTbMeetingType(Integer.parseInt(tbMeetingType));
TbMemberProject memberProject = getTbMemberProject();
payMeeting.setStandardsId(memberProject.getId());
if (oldMeeting == null){
TbMemberProject memberProject = getTbMemberProject();
payMeeting.setStandardsId(memberProject.getId());
}
break;
case MeetingCommon.INTERNATIONAL_MEETING:
ValidUtil.validate(payMeetingVO, InternationalMeeting.class);
@@ -782,6 +784,8 @@ public class PayMeetingServiceImpl extends ServiceImpl<PayMeetingMapper, PayMeet
permission = "otherMeeting:search";
}else if (meetingType.equals(MeetingCommon.COMMITTEE_MEETING_INT)){
permission = "committeeMeeting:search";
}else if (meetingType.equals(MeetingCommon.COUNCIL_MEETING_INT)){
permission = "committeeMeeting:search";
}
}
if (StringUtils.isNotBlank(permission)) {