diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/impl/ActCommentServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/impl/ActCommentServiceImpl.java
index a117db2b23..a902a78dc6 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/impl/ActCommentServiceImpl.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/impl/ActCommentServiceImpl.java
@@ -111,8 +111,10 @@ public class ActCommentServiceImpl extends BaseServiceImpl<ActCommentDao, ActCom
             }
         }
         //图片安全校验
-        List<String> imageList = formDTO.getImageList().stream().map(NoticeFileDTO::getUrl).collect(Collectors.toList());
-        noticeCommentService.safetyCheck(new ArrayList<>(), imageList);
+        if(org.apache.commons.collections4.CollectionUtils.isNotEmpty(formDTO.getImageList())){
+            List<String> imageList = formDTO.getImageList().stream().map(NoticeFileDTO::getUrl).collect(Collectors.toList());
+            noticeCommentService.safetyCheck(new ArrayList<>(), imageList);
+        }
 
         //3、插入记录
         ActCommentEntity actCommentEntity = new ActCommentEntity();
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/service/impl/NoticeCommentServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/service/impl/NoticeCommentServiceImpl.java
index 0ab3dbbc09..7556f18444 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/service/impl/NoticeCommentServiceImpl.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/service/impl/NoticeCommentServiceImpl.java
@@ -120,8 +120,10 @@ public class NoticeCommentServiceImpl extends BaseServiceImpl<NoticeCommentDao,
             }
         }
         //图片安全校验
-        List<String> imageList = formDTO.getImageList().stream().map(NoticeFileDTO::getUrl).collect(Collectors.toList());
-        safetyCheck(new ArrayList<>(), imageList);
+        if(org.apache.commons.collections4.CollectionUtils.isNotEmpty(formDTO.getImageList())){
+            List<String> imageList = formDTO.getImageList().stream().map(NoticeFileDTO::getUrl).collect(Collectors.toList());
+            safetyCheck(new ArrayList<>(), imageList);
+        }
 
         //2.判断当前用户是否被禁言、移除、非本组成员
         NoticeDTO notice = noticeService.get(formDTO.getNoticeId());
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicCommentServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicCommentServiceImpl.java
index ce928fed18..d392e1f3e5 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicCommentServiceImpl.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicCommentServiceImpl.java
@@ -217,8 +217,10 @@ public class ResiTopicCommentServiceImpl extends BaseServiceImpl<ResiTopicCommen
             }
         }
         //图片安全校验
-        List<String> imageList = resiCommentFormDTO.getImageList().stream().map(NoticeFileDTO::getUrl).collect(Collectors.toList());
-        noticeCommentService.safetyCheck(new ArrayList<>(), imageList);
+        if(CollectionUtils.isNotEmpty(resiCommentFormDTO.getImageList())){
+            List<String> imageList = resiCommentFormDTO.getImageList().stream().map(NoticeFileDTO::getUrl).collect(Collectors.toList());
+            noticeCommentService.safetyCheck(new ArrayList<>(), imageList);
+        }
 
         //1.判断当前用户是否被禁言
         ResiTopicDTO topic = resiTopicService.get(resiCommentFormDTO.getTopicId());