Merge branch 'develop'

csf-common/csf-common-model/src/main/java/com/mmc/csf/release/forum/qo/DynamicQO.java

@@ -38,8 +38,6 @@ public class DynamicQO implements Serializable {
   @ApiModelProperty(value = "审核状态")
   private Integer status;
 
-  @ApiModelProperty(value = "话题Id")
-  private Integer gambitId;
   public void buildCurrentPage() {
     this.pageNo = (pageNo - 1) * pageSize;
   }

release-service/src/main/java/com/mmc/csf/release/dao/BackstageForumDao.java

@@ -19,8 +19,7 @@ public interface BackstageForumDao {
       @Param("ids") List<Integer> ids,
       @Param("pageNo") int pageNo,
       @Param("pageSize") Integer pageSize,
-      @Param("status") Integer status,
-      @Param("gambitId") Integer gambitId
+      @Param("status") Integer status
   );
 
   /**

release-service/src/main/java/com/mmc/csf/release/service/impl/BackstageForumServiceImpl.java

@@ -79,7 +79,7 @@ public class BackstageForumServiceImpl implements BackstageForumService {
         int itemIndex = (dynamic.getPageNo() - 1) * dynamic.getPageSize();
         // 获取动态信息
         List<ForumDynamicDO> dynamicList =
-                backstageForumDao.listDynamicInfo(userIds, itemIndex, dynamic.getPageSize(),dynamic.getStatus(),dynamic.getGambitId());
+                backstageForumDao.listDynamicInfo(userIds, itemIndex, dynamic.getPageSize(),dynamic.getStatus());
         for (ForumDynamicDO forumDynamicDO : dynamicList) {
             Integer id = forumDynamicDO.getDynamicId();
             ArrayList<String> list = new ArrayList<>();

release-service/src/main/resources/mapper/forum/BackstageForumDao.xml

@@ -17,8 +17,7 @@
         </where>
     </select>
     <select id="listDynamicInfo" resultType="com.mmc.csf.release.entity.forum.ForumDynamicDO">
-        select fd.id,fd.user_account_id,description,is_deleted as deleted,fd.create_time,fd.likes_count,fd.check_status,fd.id AS dynamicId from forum_dynamic fd
-            left outer join forum_dynamic_gambit fdg on fd.id = fdg.dynamic_id
+        select id,user_account_id,description,is_deleted as deleted,create_time,check_status,id AS dynamicId from forum_dynamic
         <where>
             root_path is null
             <if test="ids != null">
@@ -27,15 +26,11 @@
                     #{ids}
                 </foreach>
             </if>
-             <if test="status != null">
-                 and fd.check_status = #{status}
-             </if>
-            <if test="gambitId != null">
-                and fdg.gambit_id = #{gambitId}
-
+            <if test="status != null">
+                and check_status = #{status}
             </if>
         </where>
-        order by fd.create_time desc
+        order by create_time desc
         limit #{pageNo},#{pageSize}
     </select>
     <select id="getDynamicAuditSum" resultType="java.lang.Integer">