fix:修复一个新增Bug

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/impl/WelcomeServiceImpl.java

@@ -139,9 +139,6 @@ public class WelcomeServiceImpl implements WelcomeService {
     }
 
     private void addWelcomeMedia(String welComeId, SaveWelcomeBO bo) {
-        if (CollectionUtils.isEmpty(bo.getMediaList())) {
-            return;
-        }
         List<TabHaobanWelcomeMedia> mediaList = bo.getMediaList().stream().map(one -> {
             TabHaobanWelcomeMedia media = new TabHaobanWelcomeMedia();
             media.setWelcomeMediaId(UniqueIdUtils.uniqueLong());

haoban-manage3-service/src/main/resources/mapper/TabHaobanWelcomeMediaMapper.xml

@@ -44,10 +44,10 @@
     </select>
 
     <!--新增所有列-->
-    <insert id="insert" keyProperty="welcomeMediaId" useGeneratedKeys="true">
-        insert into haoban3.tab_haoban_welcome_media(wx_enterprise_id, welcome_id, media_title, media_type, media_url,
+    <insert id="insert" keyProperty="welcomeSuitRangId" useGeneratedKeys="false">
+        insert into tab_haoban_welcome_media(welcome_media_id, wx_enterprise_id, welcome_id, media_title, media_type, media_url,
                                                      create_time, update_time, delete_flag)
-        values (#{wxEnterpriseId}, #{welcomeId}, #{mediaTitle}, #{mediaType}, #{mediaUrl}, #{createTime}, #{updateTime},
+        values (#{welcomeMediaId}, #{wxEnterpriseId}, #{welcomeId}, #{mediaTitle}, #{mediaType}, #{mediaUrl}, #{createTime}, #{updateTime},
                 #{deleteFlag})
     </insert>
 

haoban-manage3-service/src/main/resources/mapper/TabHaobanWelcomeSuitRangMapper.xml

@@ -113,13 +113,13 @@
     </select>
 
     <!--新增所有列-->
-    <insert id="insert" keyProperty="welcomeSuitRangId" useGeneratedKeys="true">
-        insert into haoban3.tab_haoban_welcome_suit_rang(wx_enterprise_id, welcome_id, suit_type, suit_department_id,
+    <insert id="insert" keyProperty="welcomeSuitRangId" useGeneratedKeys="false">
+        insert into haoban3.tab_haoban_welcome_suit_rang(welcome_suit_rang_id, wx_enterprise_id, welcome_id, suit_type, suit_department_id,
                                                          suit_department_name, suit_staff_id, suit_staff_name,
                                                          staff_belong_department_id, staff_belong_department_name,
                                                          select_type,
                                                          create_time, update_time, delete_flag)
-        values (#{wxEnterpriseId}, #{welcomeId}, #{suitType}, #{suitDepartmentId}, #{suitDepartmentName},
+        values (#{welcome_suit_rang_id}, #{wxEnterpriseId}, #{welcomeId}, #{suitType}, #{suitDepartmentId}, #{suitDepartmentName},
                 #{suitStaffId}, #{suitStaffName}, #{staffBelongDepartmentId}, #{staffBelongDepartmentName}, #{selectType}
                 #{createTime}, #{updateTime}, #{deleteFlag})
     </insert>

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/WelcomeController.java

@@ -47,9 +47,9 @@ public class WelcomeController extends WebBaseController {
         SaveWelcomeQDTO qdto = new SaveWelcomeQDTO();
         qdto.setWelcomeId(qo.getWelcomeId());
         qdto.setWxEnterpriseId(qo.getWxEnterpriseId());
-        qdto.setTitle(qdto.getTitle());
+        qdto.setTitle(qo.getTitle());
         qdto.setWelcomeContent(qo.getWelcomeContent());
-        qdto.setMediaList(EntityUtil.changeEntityListNew(SaveWelcomeMediaQDTO.class, qdto.getMediaList()));
+        qdto.setMediaList(EntityUtil.changeEntityListNew(SaveWelcomeMediaQDTO.class, qo.getMediaList()));
         qdto.setOperatorId(login.getStaffDTO().getStaffId());
         qdto.setOperatorName(login.getStaffDTO().getStaffName());
         qdto.setSuitDepartmentAddList(qo.getSuitDepartmentAddList());

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/interceptor/ResponseInterceptor.java

@@ -20,7 +20,7 @@ import java.lang.reflect.Method;
  * @author hua
  */
 @ControllerAdvice
-public class ResponseInterceptor implements ResponseBodyAdvice<HaobanResponse> {
+public class ResponseInterceptor implements ResponseBodyAdvice<Object> {
 
     private Logger logger = LoggerFactory.getLogger(ResponseInterceptor.class);
 
@@ -33,7 +33,7 @@ public class ResponseInterceptor implements ResponseBodyAdvice<HaobanResponse> {
     }
 
     @Override
-    public HaobanResponse beforeBodyWrite(HaobanResponse haobanResponse, MethodParameter methodParameter, MediaType mediaType, Class<? extends HttpMessageConverter<?>> aClass, ServerHttpRequest serverHttpRequest, ServerHttpResponse serverHttpResponse) {
+    public Object beforeBodyWrite(Object haobanResponse, MethodParameter methodParameter, MediaType mediaType, Class<? extends HttpMessageConverter<?>> aClass, ServerHttpRequest serverHttpRequest, ServerHttpResponse serverHttpResponse) {
         String response = JSONObject.toJSONString(haobanResponse);
         logger.info("response:{}", response);
         return haobanResponse;