Merge remote-tracking branch 'origin/master'

pmapi/src/main/java/com/ningdatech/pmapi/meeting/manage/MeetingManage.java

@@ -249,7 +249,7 @@ public class MeetingManage {
                 ExpertInviteAvoidRule avoidRule = new ExpertInviteAvoidRule();
                 avoidRule.setMeetingId(meeting.getId());
                 // 未传值时设置为0 表示不限制周参与次数
-                avoidRule.setWeekInviteCount(ObjectUtil.defaultIfNull(avoidRule.getWeekInviteCount(), 0));
+                avoidRule.setWeekInviteCount(ObjectUtil.defaultIfNull(avoidInfo.getWeekInviteCount(), 0));
                 avoidRule.setAvoidOrgIds(CollUtils.joinByComma(avoidInfo.getAvoidOrgIdList()));
                 avoidRule.setAvoidUnitIds(CollUtils.joinByComma(avoidInfo.getAvoidUnitIdList()));
                 avoidRule.setAvoidExpertIds(CollUtils.joinByComma(avoidInfo.getExpertIds()));