DynamicServiceImpl(update)

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

@@ -297,6 +297,7 @@ public class DynamicServiceImpl implements DynamicService {
             Integer pageNo, Integer pageSize, Integer userId, HttpServletRequest request, Integer gambitId,Integer dynId,Integer userAccountIds,
             String description,List<String> gambitName) {
         Integer tokenUserId =userId;
+        Integer inUserId =userAccountIds;
         int count = dynamicDao.countDynamicList(dynId,userAccountIds,description);
         if (count == 0) {
             return PageResult.buildPage(pageNo, pageSize, 0);
@@ -449,15 +450,15 @@ public class DynamicServiceImpl implements DynamicService {
             Integer userAccountId = dynamicVO.getUserAccountId();
          int countAttention= gambitDao.selectCountAttentions(userAccountId,userId);
         // int countA=gambitDao.selectCountAttentions(userId,userAccountId);
-            List<ForumAttentionDO> forumAttentionDOS = gambitDao.selectAttentionCount(userAccountId, userId);
+            List<ForumAttentionDO> forumAttentionDOS=null;
+            if(inUserId==null){
+                forumAttentionDOS= gambitDao.selectAttentionCount(inUserId, userId);
+            }else if (inUserId!=null){
+                forumAttentionDOS= gambitDao.selectAttentionCount(userAccountId, userId);
+            }
             if (countAttention!=0){
              dynamicVO.setStatus(true);
             }
-           // if (countA!=0){
-           //     dynamicVO.setStatus(true);
-          //  }
-
-            System.out.println(userId);
             for (ForumAttentionDO forumAttentionDO : forumAttentionDOS) {
                 if (forumAttentionDO!=null){
                     Integer userAccountId1 = dynamicVO.getUserAccountId();
@@ -480,6 +481,9 @@ public class DynamicServiceImpl implements DynamicService {
             if (tokenUserId.equals(dynamicVO.getUserAccountId())){
                 dynamicVO.setStatus(null);
             }
+            if (inUserId!=null && inUserId.equals(dynamicVO.getUserAccountId())){
+                dynamicVO.setStatus(null);
+            }
         }
         return PageResult.buildPage(pageNo, pageSize, count, dynamicVOList);
     }