Gambit(update)

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

@@ -299,6 +299,7 @@ public class DynamicServiceImpl implements DynamicService {
     public PageResult dynamicList(
             Integer pageNo, Integer pageSize, Integer userId, HttpServletRequest request, Integer gambitId,Integer dynId,Integer userAccountIds,
             String description,List<String> gambitName) {
+        Integer tokenUserId =userId;
         int count = dynamicDao.countDynamicList(dynId,userAccountIds,description);
         if (count == 0) {
             return PageResult.buildPage(pageNo, pageSize, 0);
@@ -458,17 +459,30 @@ public class DynamicServiceImpl implements DynamicService {
            // if (countA!=0){
            //     dynamicVO.setStatus(true);
           //  }
+
             System.out.println(userId);
             for (ForumAttentionDO forumAttentionDO : forumAttentionDOS) {
-                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);
+                if (forumAttentionDO!=null){
+                    Integer userAccountId1 = dynamicVO.getUserAccountId();
+                    if (userAccountId1.equals(userId)&& forumAttentionDO.getMutualAttention().equals(false)){
+                        if (forumAttentionDO.getAttentionUserAccountId().equals(dynamicVO.getUserAccountId())||
+                                        forumAttentionDO.getUserAccountId().equals(dynamicVO.getUserAccountId())
+                        ){
+                            dynamicVO.setStatus(true);
+                        }
+                    }
+                    if (forumAttentionDO.getMutualAttention().equals(true)){
+                        if (forumAttentionDO.getAttentionUserAccountId().equals(dynamicVO.getUserAccountId())||
+                                forumAttentionDO.getUserAccountId().equals(dynamicVO.getUserAccountId())
+                        ){
+                            dynamicVO.setStatus(true);
+                        }
                     }
                 }
             }
+            if (tokenUserId.equals(dynamicVO.getUserAccountId())){
+                dynamicVO.setStatus(null);
+            }
         }
         return PageResult.buildPage(pageNo, pageSize, count, dynamicVOList);
     }