Merge branch 'dev' into 'master'

fix

See merge request !16

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

@@ -176,7 +176,7 @@ public class HomePageManager {
             }
             // 家办活动
             CommonResp<List<OfflineActivitySimpleResp>> activitySimpleResps = feignClientForActivity.simpleListByOrgid(userInfoNew.getUserInfoNewOrg().getCorpId());
-            if (usetInfoByOrgUserId.isSuccess() && CollectionUtils.isNotEmpty(usetInfoByOrgUserId.getData())) {
+            if (activitySimpleResps.isSuccess() && CollectionUtils.isNotEmpty(activitySimpleResps.getData())) {
                 List<OfflineActivitySimpleResp> activities = activitySimpleResps.getData();
                 if (CollectionUtils.isNotEmpty(activities)){
                     userInfoNew.setHoldActivities(activities.stream().filter(o->o.getActivityType().equals(1)).collect(Collectors.toList()));