DynamicMapper.xml(update)

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

@@ -90,6 +90,8 @@ public interface DynamicDao {
      */
     List<ForumDynamicDO> dynamicList(int itemIndex, Integer pageSize,Integer id,Integer userAccountIds);
 
+    List<ForumDynamicDO> dynamicListGambit(int itemIndex, Integer pageSize,Integer id,Integer userAccountIds,Integer gambitId);
+
     /**
      * 列表动态图片
      *

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

@@ -268,7 +268,8 @@ public class GambitServiceImpl implements GambitService {
     @Override
     public ResultBody userMessage(Integer userAccountId,Integer userId) {
       ForumCountDO forumCountDO= gambitDao.userMessage(userAccountId);
-        int i = gambitDao.selectCountAttention(userId);
+        int i= gambitDao.selectCountAttentions(userAccountId,userId);
+      //  int i = gambitDao.selectCountAttention(userId);
         if (i!=0){
             forumCountDO.setStatus(true);
         }

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

@@ -290,6 +290,10 @@ public class DynamicServiceImpl implements DynamicService {
         }
         int itemIndex = (pageNo - 1) * pageSize;
         List<ForumDynamicDO> forumDynamicList = dynamicDao.dynamicList(itemIndex, pageSize,dynId,userAccountIds);
+        if (gambitId!=null){
+         forumDynamicList = dynamicDao.dynamicListGambit(itemIndex, pageSize,dynId,userAccountIds,gambitId);
+        }
+
        for (ForumDynamicDO forumDynamicDO : forumDynamicList) {
             Integer dynamicId = forumDynamicDO.getDynamicId();
            ForumReviewVO forumReviewVO = gambitDao.selectForumReviewMessage(dynamicId);

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

@@ -345,6 +345,39 @@
             LIMIT #{itemIndex}, #{pageSize}
     </select>
 
+    <select id="dynamicListGambit" resultType="com.mmc.csf.release.entity.forum.ForumDynamicDO">
+        SELECT
+            fd.id,
+            fd.version,
+            fd.user_account_id,
+            fd.description,
+            fd.location,
+            fd.lat,
+            fd.lon,
+            fd.likes_count,
+            fd.comments_count,
+            fd.create_time,
+            fd.id AS dynamicId,
+            fdg.gambit_id
+        FROM
+            forum_dynamic fd
+                INNER JOIN forum_dynamic_gambit fdg ON fd.id = fdg.dynamic_id
+                AND fdg.gambit_id = #{gambitId}
+        WHERE
+            fd.is_deleted = 0
+          AND fd.root_path IS NULL
+          AND fd.check_status = 1
+        <if test="id!=null" >
+            and fd.id=#{id}
+        </if>
+        <if test="userAccountIds!=null">
+            and fd.user_account_id=#{userAccountIds}
+        </if>
+        ORDER BY
+            fd.create_time DESC
+            LIMIT #{itemIndex}, #{pageSize}
+    </select>
+
     <select id="listDynamicPicture" resultType="com.mmc.csf.release.entity.forum.ForumResourceDO">
         select dynamic_id,
         resource_url,