fix bug 除了会议负责人之外的角色也可以新增参会人

jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java

@@ -138,9 +138,12 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
         }
 
         LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+        if (!rolePermissionService.getRolePermission("committeeMeetingSituation:add")) {
             if (!Objects.equals(payMeeting1.getDirectorId(),loginUser.getId())) {
                 throw new JeroBootException("只有会议负责人可以新增参会人");
             }
+        }
+
         payMeetingSituation.setStatus(MeetingSubitemCommon.STATUS_3);
         //payMeetingSituation.setNeedInvoice(PayProjectCommon.NO);
         payMeetingSituation.setAmountReceivable(new BigDecimal("0"));
@@ -252,7 +255,6 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
 
     private void saveMeetingSituation(PayMeetingSituation payMeetingSituation1) {
         payMeetingSituation1.setCheckIn(PayProjectCommon.NO);
-        payMeetingSituation1.setCheckResult(MeetingSubitemCommon.SIGNUP_STATUS_0);
         payMeetingSituation1.setPaidAmount(new BigDecimal("0"));
 
         //到账
@@ -472,6 +474,7 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
         LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
         String sysUserId = sysUser.getId();
         String meetingType = payMeeting.getMeetingType().toString();
+        if (!rolePermissionService.getRolePermission("committeeMeetingSituation:add")) {
             if (meetingType.equals(MeetingCommon.INTERNATIONAL_MEETING)) {
                 //只有会议负责人，对接人可以审批
                 if (!directorId.equals(sysUserId) && !sysUserId.equals(payMeetingSituation.getCompanyContactId())) {
@@ -484,6 +487,7 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
                 }
             }
         }
+    }
 
     @Override
     public void checkRegister(CheckVO checkVO) {
@@ -843,6 +847,7 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
         //要保存的对象
         PayMeetingSituation payMeetingSituation1 = new PayMeetingSituation();
         payMeetingSituation1.setAmountReceivable(new BigDecimal("0"));
+        payMeetingSituation1.setCheckResult(MeetingSubitemCommon.SIGNUP_STATUS_1);
         //会议校验基础类
         MeetingEntity meetingEntity = new MeetingEntity();
         BeanUtils.copyProperties(payMeetingSituation, meetingEntity);