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 665511c..c933040 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
@@ -5,6 +5,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.ToString;
 import com.bonus.common.core.web.domain.BaseEntity;
+import java.util.List;
 
 /**
  * 投诉建议 对象 basic_canteen_suggestion
@@ -37,6 +38,8 @@ public class BasicCanteenSuggestion extends BaseEntity {
     @ApiModelProperty(value = "食堂id")
     private Long canteenId;
 
+    private String canteenName;
+
     /** 联系方式 */
     @Excel(name = "联系方式")
     @ApiModelProperty(value = "联系方式")
@@ -57,5 +60,5 @@ public class BasicCanteenSuggestion extends BaseEntity {
     @ApiModelProperty(value = "回复者用户id")
     private Long replyUserId;
 
-
+    private List<BasicCanteenSuggestionPicture> canteenSuggestionPictures;
 }
diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/basic/mapper/BasicCanteenSuggestionPictureMapper.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/basic/mapper/BasicCanteenSuggestionPictureMapper.java
index eb0a453..e242b1c 100644
--- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/basic/mapper/BasicCanteenSuggestionPictureMapper.java
+++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/basic/mapper/BasicCanteenSuggestionPictureMapper.java
@@ -18,6 +18,8 @@ public interface BasicCanteenSuggestionPictureMapper {
      */
     public BasicCanteenSuggestionPicture selectBasicCanteenSuggestionPictureById(Long id);
 
+    public List<BasicCanteenSuggestionPicture> selectBasicCanteenSuggestionPictureBySuggestionId(Long suggestionId);
+
     /**
      * 查询订单评价菜品列表
      * 
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 3426050..899fc35 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
@@ -1,8 +1,11 @@
 package com.bonus.canteen.core.basic.service.impl;
 
 import java.util.List;
+import com.bonus.canteen.core.basic.domain.BasicCanteenSuggestionPicture;
+import com.bonus.canteen.core.basic.mapper.BasicCanteenSuggestionPictureMapper;
 import com.bonus.common.core.exception.ServiceException;
 import com.bonus.common.core.utils.DateUtils;
+import com.bonus.common.security.utils.SecurityUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.bonus.canteen.core.basic.mapper.BasicCanteenSuggestionMapper;
@@ -19,6 +22,8 @@ import com.bonus.canteen.core.basic.service.IBasicCanteenSuggestionService;
 public class BasicCanteenSuggestionServiceImpl implements IBasicCanteenSuggestionService {
     @Autowired
     private BasicCanteenSuggestionMapper basicCanteenSuggestionMapper;
+    @Autowired
+    BasicCanteenSuggestionPictureMapper basicCanteenSuggestionPictureMapper;
 
     /**
      * 查询投诉建议 
@@ -28,7 +33,10 @@ public class BasicCanteenSuggestionServiceImpl implements IBasicCanteenSuggestio
      */
     @Override
     public BasicCanteenSuggestion selectBasicCanteenSuggestionBySuggestionId(Long suggestionId) {
-        return basicCanteenSuggestionMapper.selectBasicCanteenSuggestionBySuggestionId(suggestionId);
+        List<BasicCanteenSuggestionPicture> pictureList = basicCanteenSuggestionPictureMapper.selectBasicCanteenSuggestionPictureBySuggestionId(suggestionId);
+        BasicCanteenSuggestion basicCanteenSuggestion = basicCanteenSuggestionMapper.selectBasicCanteenSuggestionBySuggestionId(suggestionId);
+        basicCanteenSuggestion.setCanteenSuggestionPictures(pictureList);
+        return basicCanteenSuggestion;
     }
 
     /**
@@ -51,8 +59,20 @@ public class BasicCanteenSuggestionServiceImpl implements IBasicCanteenSuggestio
     @Override
     public int insertBasicCanteenSuggestion(BasicCanteenSuggestion basicCanteenSuggestion) {
         basicCanteenSuggestion.setCreateTime(DateUtils.getNowDate());
+        basicCanteenSuggestion.setCreateBy(SecurityUtils.getUsername());
         try {
-            return basicCanteenSuggestionMapper.insertBasicCanteenSuggestion(basicCanteenSuggestion);
+            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);
+            }
+            return count;
         } catch (Exception e) {
             throw new ServiceException(e.getMessage());
         }
diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/basic/BasicCanteenSuggestionMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/basic/BasicCanteenSuggestionMapper.xml
index aa7c05a..03210c9 100644
--- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/basic/BasicCanteenSuggestionMapper.xml
+++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/basic/BasicCanteenSuggestionMapper.xml
@@ -8,6 +8,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="userId"    column="user_id"    />
         <result property="content"    column="content"    />
         <result property="canteenId"    column="canteen_id"    />
+        <result property="canteenName"    column="canteen_name"    />
         <result property="contactTel"    column="contact_tel"    />
         <result property="replyContent"    column="reply_content"    />
         <result property="replyState"    column="reply_state"    />
@@ -19,7 +20,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectBasicCanteenSuggestionVo">
-        select suggestion_id, user_id, content, canteen_id, contact_tel, reply_content, reply_state, reply_user_id, create_by, create_time, update_by, update_time from basic_canteen_suggestion
+        select bcs.suggestion_id, bcs.user_id, bcs.content, bcs.canteen_id, bcs.contact_tel, bcs.reply_content,
+               bcs.reply_state, bcs.reply_user_id, bcs.create_by, bcs.create_time, bcs.update_by, bcs.update_time,
+               bc.canteen_name
+        from basic_canteen_suggestion bcs
+        left join basic_canteen bc on bc.canteen_id = bcs.canteen_id
     </sql>
 
     <select id="selectBasicCanteenSuggestionList" parameterType="com.bonus.canteen.core.basic.domain.BasicCanteenSuggestion" resultMap="BasicCanteenSuggestionResult">
diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/basic/BasicCanteenSuggestionPictureMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/basic/BasicCanteenSuggestionPictureMapper.xml
index 6c2f228..414a8e4 100644
--- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/basic/BasicCanteenSuggestionPictureMapper.xml
+++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/basic/BasicCanteenSuggestionPictureMapper.xml
@@ -29,6 +29,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="selectBasicCanteenSuggestionPictureVo"/>
         where id = #{id}
     </select>
+
+    <select id="selectBasicCanteenSuggestionPictureBySuggestionId" parameterType="Long" resultMap="BasicCanteenSuggestionPictureResult">
+        <include refid="selectBasicCanteenSuggestionPictureVo"/>
+        where suggestion_id = #{suggestionId}
+    </select>
         
     <insert id="insertBasicCanteenSuggestionPicture" parameterType="com.bonus.canteen.core.basic.domain.BasicCanteenSuggestionPicture" useGeneratedKeys="true" keyProperty="id">
         insert into basic_canteen_suggestion_picture