From 6c5165f73c90fbd4e22e4f9a39497b5a25ee37f9 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 26 十二月 2024 09:53:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/RoomsServiceImpl.java |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/RoomsServiceImpl.java b/server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/RoomsServiceImpl.java
index 5477185..5a28dcf 100644
--- a/server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/RoomsServiceImpl.java
+++ b/server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/RoomsServiceImpl.java
@@ -106,9 +106,12 @@
         roomsMapper.insert(rooms);
         if(!Constants.equalsInteger(rooms.getFileType(),Constants.TWO)){
             List<Multifile> multifileList = rooms.getMultifileList();
+            if(CollectionUtils.isEmpty(multifileList)){
+                throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"璇蜂笂浼犻檮浠朵俊鎭�");
+            }
             for (Multifile multifile:multifileList) {
                 if(Objects.isNull(multifile)
-                || StringUtils.isBlank(multifile.getFileurl())){
+                    || StringUtils.isBlank(multifile.getFileurl())){
                     throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"闄勪欢鍙傛暟閿欒");
                 }
                 multifile.setCreateDate(new Date());
@@ -367,7 +370,7 @@
         Integer re = recordisExist(rooms.getId());
         if (Constants.equalsInteger(re, Constants.ONE)) {
             //瀛樹笅棰勭害璁板綍涓嶅厑璁告洿鏂板紑鏀炬椂闂村拰绮掑害鍒嗛挓
-           // throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "浼氳瀹ゅ瓨鍦ㄩ绾︿腑鐨勮褰曪紝涓嶅厑璁镐慨鏀�");
+//            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "浼氳瀹ゅ瓨鍦ㄩ绾︿腑鐨勮褰曪紝涓嶅厑璁镐慨鏀�");
             rooms.setStartTime(null);
             rooms.setEndTime(null);
             rooms.setIntervalTime(null);
@@ -397,6 +400,9 @@
 
         if(!Constants.equalsInteger(rooms.getFileType(),Constants.TWO)){
             List<Multifile> multifileList = rooms.getMultifileList();
+            if(CollectionUtils.isEmpty(multifileList)){
+                throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"璇蜂笂浼犻檮浠朵俊鎭�");
+            }
             for (Multifile multifile:multifileList) {
                 if(Objects.isNull(multifile)
                         || StringUtils.isBlank(multifile.getFileurl())){

--
Gitblit v1.9.3