fix 46870 理事会-理事会会议维护--编辑参会人,只修改行程信息,仍然报提示

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

@@ -140,7 +140,8 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
     private IPayMeetingContactsService meetingContactsService;
 
 
-    private static final String[] CAN_MODIFY_LIST = new String[]{"arrivalTime", "departureTime", "checkInHotel"};
+    private static final String[] CAN_MODIFY_LIST =
+            new String[]{"arrivalTime", "departureTime", "checkInHotel"};
 
     /**
      * 保存
@@ -930,17 +931,26 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
         payMeetingSituationVO.setAmountReceivable(payMeetingSituation.getAmountReceivable());
         BeanUtils.copyProperties(payMeetingSituationVO, payMeetingSituation);
         //处理校验参会人信息
-        PayMeetingSituation payMeetingSituation1 = getPayMeetingSituation(payMeetingSituation);
-        //判断是否修改缴费凭证
+        PayMeetingSituation payMeetingSituation1;
+        //判断是否审核通过
         Integer checkResult = oldObject.getCheckResult();
-        if (Objects.equals(checkResult, MeetingSubitemCommon.SIGNUP_STATUS_1)) {
-            ObjRecordUtilModule objRecordUtilModule = ObjRecordUtil.addRecord(oldObject, payMeetingSituation1);
+        Integer registerCheckResult = oldObject.getRegisterCheckResult();
+
+        if (Objects.equals(checkResult, MeetingSubitemCommon.SIGNUP_STATUS_1) && Objects.equals(registerCheckResult, MeetingSubitemCommon.SIGNUP_STATUS_1)) {
+            /*ObjRecordUtilModule objRecordUtilModule = ObjRecordUtil.addRecord(oldObject, payMeetingSituation1);
             List<String> fieldNames = objRecordUtilModule.getFieldNames();
             List<String> canModifyList = Arrays.asList(CAN_MODIFY_LIST);
             boolean containsAll = canModifyList.containsAll(fieldNames);
             if (!containsAll) {
                 throw new JeroBootException("审核通过之后只允许修改行程信息");
-            }
+            }*/
+            payMeetingSituation1 = new PayMeetingSituation();
+            payMeetingSituation1.setId(payMeetingSituationVO.getId());
+            payMeetingSituation1.setArrivalTime(payMeetingSituationVO.getArrivalTime());
+            payMeetingSituation1.setDepartureTime(payMeetingSituationVO.getDepartureTime());
+            payMeetingSituation1.setCheckInHotel(payMeetingSituationVO.getCheckInHotel());
+        }else {
+            payMeetingSituation1 = getPayMeetingSituation(payMeetingSituation);
         }
         //如果是对接人修改的
         if (sysUserId.equals(dockId)) {