DynamicServiceImpl(update)

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

@@ -450,18 +450,24 @@ public class DynamicServiceImpl implements DynamicService {
         for (DynamicVO dynamicVO : dynamicVOList) {
             Integer userAccountId = dynamicVO.getUserAccountId();
          int countAttention= gambitDao.selectCountAttentions(userAccountId,userId);
-         int countA=gambitDao.selectCountAttentions(userId,userAccountId);
+        // int countA=gambitDao.selectCountAttentions(userId,userAccountId);
          ForumAttentionDO forumAttentionDO = gambitDao.selectAttentionCount(userAccountId, userId);
             if (countAttention!=0){
              dynamicVO.setStatus(true);
             }
-            if (countA!=0){
-                dynamicVO.setStatus(true);
-            }
+           // if (countA!=0){
+           //     dynamicVO.setStatus(true);
+          //  }
+            System.out.println(userId);
             if (forumAttentionDO!=null && forumAttentionDO.getMutualAttention().equals(true)){
+                if (!dynamicVO.getUserAccountId().equals(userId) &&
+                forumAttentionDO.getAttentionUserAccountId().equals(dynamicVO.getUserAccountId())||
+                forumAttentionDO.getUserAccountId().equals(dynamicVO.getUserAccountId())
+                ){
                     dynamicVO.setStatus(true);
                 }
             }
+        }
         return PageResult.buildPage(pageNo, pageSize, count, dynamicVOList);
     }