From e6be4a0ee0c4034de51d8348c4523795b78c9b70 Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Wed, 26 Oct 2022 14:29:59 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E7=BC=96=E8=BE=91=E6=A0=87=E5=8D=8F?=
 =?UTF-8?q?=E4=BC=9A=E8=AE=AE=E6=97=B6=E6=B2=A1=E6=9C=89=E9=85=92=E5=BA=97?=
 =?UTF-8?q?=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/HotelManagementServiceImpl.java          | 4 ++--
 .../service/impl/StableCrossTrainingServiceImpl.java      | 8 +++++++-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/standards/jiudian/hotelManagement/service/impl/HotelManagementServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/standards/jiudian/hotelManagement/service/impl/HotelManagementServiceImpl.java
index 880b898d..4169a419 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/standards/jiudian/hotelManagement/service/impl/HotelManagementServiceImpl.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/standards/jiudian/hotelManagement/service/impl/HotelManagementServiceImpl.java
@@ -84,13 +84,13 @@ public class HotelManagementServiceImpl extends ServiceImpl<HotelManagementMappe
     public Boolean edit(HotelManagement hotelManagement) {
         //判断主键是否存在
         if (StringUtils.isBlank(hotelManagement.getId())) {
-            throw new JeroBootException(Result.NULL_ID);
+            return false;
         }
         //判断Entity是否存在
         if (hotelManagement == null) {
             throw new JeroBootException(Result.NULL_DATA);
         }
-        HotelManagement hotelManagementDB = hotelManagementService.getById(hotelManagement.getId());
+        //HotelManagement hotelManagementDB = hotelManagementService.getById(hotelManagement.getId());
 
         //获取召开时间
         try {
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/standards/xuanguan/stablecrosstraining/service/impl/StableCrossTrainingServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/standards/xuanguan/stablecrosstraining/service/impl/StableCrossTrainingServiceImpl.java
index d9b27bdc..7fd5cb4b 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/standards/xuanguan/stablecrosstraining/service/impl/StableCrossTrainingServiceImpl.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/standards/xuanguan/stablecrosstraining/service/impl/StableCrossTrainingServiceImpl.java
@@ -1,5 +1,6 @@
 package com.jero.standards.xuanguan.stablecrosstraining.service.impl;
 
+import cn.hutool.core.collection.ListUtil;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.http.HttpUtil;
@@ -26,6 +27,8 @@ import com.jero.standards.meetingNews.entity.MeetingNews;
 import com.jero.standards.meetingNews.service.IMeetingNewsService;
 import com.jero.standards.xuanguan.stablecrosstraining.entity.WebMeetingStandard;
 import com.jero.standards.xuanguan.stablecrosstraining.service.IWebMeetingStandardService;
+import org.apache.commons.collections4.ListUtils;
+import org.apache.commons.lang3.ArrayUtils;
 import org.apache.commons.lang3.StringUtils;
 import com.jero.standards.xuanguan.attendmeetings.entity.AttendMeetings;
 import com.jero.standards.xuanguan.attendmeetings.service.IAttendMeetingsService;
@@ -297,7 +300,10 @@ public class StableCrossTrainingServiceImpl extends ServiceImpl<StableCrossTrain
                     .setPlace(stableCrossTraining.getConvokeLocale()).setPlaceName(stableCrossTraining.getPlaceName())
                     .setHotelName(stableCrossTraining.getHotelName()).setAddress(stableCrossTraining.getHotelAddress())
 //                .setContactPerson(stableCrossTraining.getContactPerson()).setContactNumber(stableCrossTraining.getContactNumber())
-                    .setMeetingType(1).setId(hotelManagements.get(0).getId());
+                    .setMeetingType(1);
+            if (!hotelManagements.isEmpty()) {
+                hotelManagement.setId(hotelManagements.get(0).getId());
+            }
             hotelManagementService.edit(hotelManagement);
             webMeetingStandardService.remove(new LambdaQueryWrapper<WebMeetingStandard>().eq(WebMeetingStandard::getStableCrossId,stableCrossTraining.getId()));
             if(!CollectionUtils.isEmpty(stableCrossTraining.getQuestionList())){