From 8178ad05fa29b1ee04a93d9a5dc2eaecaddfe652 Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Wed, 29 Dec 2021 16:41:05 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E9=85=92=E5=BA=97=E8=81=94=E7=B3=BB?=
 =?UTF-8?q?=E4=BA=BA=20=E9=9D=9E=E5=BF=85=E5=A1=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/PayMeetingServiceImpl.java       |  8 ++++----
 .../service/impl/HotelManagementServiceImpl.java  | 15 ++++-----------
 2 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java
index 39ae28c3..121343e3 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java
@@ -331,7 +331,7 @@ public class PayMeetingServiceImpl extends ServiceImpl<PayMeetingMapper, PayMeet
                 payMeetingVO.setRemind(MeetingCommon.REMIND_0);
                 break;
             case MeetingCommon.STANDARD_MEETING:
-                ValidUtil.validate(payMeetingVO, StandardMeeting.class);
+                //ValidUtil.validate(payMeetingVO, StandardMeeting.class);
                 //标协会议类型
                 String tbMeetingType = payMeetingVO.getTbMeetingType();
                 String standardMeetingType = sysBaseAPI.translateDict("standard_meeting_type", tbMeetingType);
@@ -386,9 +386,9 @@ public class PayMeetingServiceImpl extends ServiceImpl<PayMeetingMapper, PayMeet
         if (hotelContactsList==null){
             throw new JeroBootException("酒店信息不能为空");
         }
-        for (PayMeetingHotelContacts hotelContacts : hotelContactsList) {
-            ValidUtil.validate(hotelContacts, StandardMeeting.class);
-        }
+        //for (PayMeetingHotelContacts hotelContacts : hotelContactsList) {
+        //    ValidUtil.validate(hotelContacts, StandardMeeting.class);
+        //}
         BeanUtils.copyProperties(payMeetingVO, payMeeting);
         payMeeting.setIsRelease(MeetingCommon.REMIND_0);
         return payMeeting;
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 82537b37..880b898d 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
@@ -120,23 +120,16 @@ public class HotelManagementServiceImpl extends ServiceImpl<HotelManagementMappe
     }
 
     public void ifEntityIsEmpty(HotelManagement hotelManagement) {
-        if (StringUtils.isBlank(hotelManagement.getHotelName())) {
-            throw new JeroBootException("请核实酒店名称是否存在!");
-        } else {
-            if (hotelManagement.getHotelName().length()>50) {
+        if (StringUtils.isNotBlank(hotelManagement.getHotelName())) {
+            if (hotelManagement.getHotelName().length() > 50) {
                 throw new JeroBootException("酒店名称输入超过限定长度!");
             }
         }
-        if (StringUtils.isBlank(hotelManagement.getAddress())) {
-            throw new JeroBootException("请核实酒店地址是否存在!");
-        } else {
-            if (hotelManagement.getAddress().length()>50) {
+        if (StringUtils.isNotBlank(hotelManagement.getAddress())) {
+            if (hotelManagement.getAddress().length() > 50) {
                 throw new JeroBootException("酒店地址输入超过限定长度!");
             }
         }
-        if (hotelManagement.getHotelList().isEmpty()) {
-            throw new JeroBootException("请核实酒店联系人/电话是否存在!");
-        }
 /*        if (hotelManagement.getHotelList().isEmpty()) {
             throw new JeroBootException("请核实酒店联系人/电话是否存在!");
         }