Merge remote-tracking branch 'origin/v2.2.7' into dev

community-service/src/main/java/com/tanpu/community/manager/HomePageManager.java

@@ -95,6 +95,7 @@ public class HomePageManager {
             throw new BizException("内部接口调用失败");
         UserInfoResp userInfoNew = queryUsersListNew.getData();
 
+        userInfoNew.setShowFollowStatus(ShowFollowStatusEnum.NOT_FOLLOWED.getCode());
         if (StringUtils.isNotBlank(userIdMyself)) {
             if (!StringUtils.equals(userIdMyself, userId)) {
                 // 查询别人的个人主页
@@ -102,8 +103,6 @@ public class HomePageManager {
                 FollowRelEntity followRelEntity = followRelService.queryRecord(userId, userIdMyself);
                 if (ObjectUtils.allNotNull(followRelEntity) && BizStatus.DeleteTag.tag_init == followRelEntity.getDeleteTag()) {
                     userInfoNew.setShowFollowStatus(ShowFollowStatusEnum.FOLLOWED.getCode()); // 已关注
-                } else {
-                    userInfoNew.setShowFollowStatus(ShowFollowStatusEnum.NOT_FOLLOWED.getCode()); // 未关注
                 }
                 if (userInfoNew.getWorkshopStatus() == 2) userInfoNew.setWorkshopStatus(1); //别人的主页不需要展示 工作室
             }