diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/basic/domain/BasicCanteenSuggestion.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/basic/domain/BasicCanteenSuggestion.java
index 677643e..55cd7a3 100644
--- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/basic/domain/BasicCanteenSuggestion.java
+++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/basic/domain/BasicCanteenSuggestion.java
@@ -66,5 +66,5 @@ public class BasicCanteenSuggestion extends BaseEntity {
     @ApiModelProperty(value = "回复者用户id")
     private Long replyUserId;
 
-    private List<BasicCanteenSuggestionPicture> canteenSuggestionPictures;
+    private List<BasicCanteenSuggestionPicture> suggestionPictures;
 }
diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/basic/service/impl/BasicCanteenSuggestionServiceImpl.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/basic/service/impl/BasicCanteenSuggestionServiceImpl.java
index 899fc35..ceb115a 100644
--- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/basic/service/impl/BasicCanteenSuggestionServiceImpl.java
+++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/basic/service/impl/BasicCanteenSuggestionServiceImpl.java
@@ -11,6 +11,7 @@ import org.springframework.stereotype.Service;
 import com.bonus.canteen.core.basic.mapper.BasicCanteenSuggestionMapper;
 import com.bonus.canteen.core.basic.domain.BasicCanteenSuggestion;
 import com.bonus.canteen.core.basic.service.IBasicCanteenSuggestionService;
+import org.springframework.util.CollectionUtils;
 
 /**
  * 投诉建议 Service业务层处理
@@ -33,9 +34,9 @@ public class BasicCanteenSuggestionServiceImpl implements IBasicCanteenSuggestio
      */
     @Override
     public BasicCanteenSuggestion selectBasicCanteenSuggestionBySuggestionId(Long suggestionId) {
-        List<BasicCanteenSuggestionPicture> pictureList = basicCanteenSuggestionPictureMapper.selectBasicCanteenSuggestionPictureBySuggestionId(suggestionId);
+        List<BasicCanteenSuggestionPicture> suggestionPictures = basicCanteenSuggestionPictureMapper.selectBasicCanteenSuggestionPictureBySuggestionId(suggestionId);
         BasicCanteenSuggestion basicCanteenSuggestion = basicCanteenSuggestionMapper.selectBasicCanteenSuggestionBySuggestionId(suggestionId);
-        basicCanteenSuggestion.setCanteenSuggestionPictures(pictureList);
+        basicCanteenSuggestion.setSuggestionPictures(suggestionPictures);
         return basicCanteenSuggestion;
     }
 
@@ -63,14 +64,16 @@ public class BasicCanteenSuggestionServiceImpl implements IBasicCanteenSuggestio
         try {
             int count = basicCanteenSuggestionMapper.insertBasicCanteenSuggestion(basicCanteenSuggestion);
             long suggestionId = basicCanteenSuggestion.getSuggestionId();
-            List<BasicCanteenSuggestionPicture> pictureList = basicCanteenSuggestion.getCanteenSuggestionPictures();
-            for (int i = 0; i < pictureList.size(); i++) {
-                BasicCanteenSuggestionPicture suggestionPicture = new BasicCanteenSuggestionPicture();
-                suggestionPicture.setSuggestionId(suggestionId);
-                suggestionPicture.setImgUrl(pictureList.get(i).getImgUrl());
-                suggestionPicture.setCreateTime(DateUtils.getNowDate());
-                suggestionPicture.setCreateBy(SecurityUtils.getUsername());
-                basicCanteenSuggestionPictureMapper.insertBasicCanteenSuggestionPicture(suggestionPicture);
+            List<BasicCanteenSuggestionPicture> suggestionPictures = basicCanteenSuggestion.getSuggestionPictures();
+            if (!CollectionUtils.isEmpty(suggestionPictures)) {
+                for (int i = 0; i < suggestionPictures.size(); i++) {
+                    BasicCanteenSuggestionPicture suggestionPicture = new BasicCanteenSuggestionPicture();
+                    suggestionPicture.setSuggestionId(suggestionId);
+                    suggestionPicture.setImgUrl(suggestionPictures.get(i).getImgUrl());
+                    suggestionPicture.setCreateTime(DateUtils.getNowDate());
+                    suggestionPicture.setCreateBy(SecurityUtils.getUsername());
+                    basicCanteenSuggestionPictureMapper.insertBasicCanteenSuggestionPicture(suggestionPicture);
+                }
             }
             return count;
         } catch (Exception e) {