Merge branch 'bugfix_1115' into 'master'

bugfix

See merge request !20

community-service/src/main/java/com/tanpu/community/feign/activity/FeignClientForActivity.java

@@ -24,5 +24,6 @@ public interface FeignClientForActivity {
 
     @ApiOperation("线下活动列表-查询机构首页线下活动列表")
     @GetMapping(value = "/offlineActivity/inter/queryCorpHomeActivityList")
-    CommonResp<List<OfflineActivitySimpleResp>> queryCorpHomeActivityList(@ApiParam("活动id") @RequestParam(value = "corpId") String corpId);
+    CommonResp<List<OfflineActivitySimpleResp>> queryCorpHomeActivityList(@ApiParam("活动id") @RequestParam(value = "corpId") String corpId,
+                                                                          @ApiParam("用户id") @RequestParam(value = "userId") String userId);
 }

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

@@ -184,7 +184,8 @@ public class HomePageManager {
                 userInfoNew.setUserInfoOrgList(userInfoOrgs);
             }
             // 家办活动
-            CommonResp<List<OfflineActivitySimpleResp>> activitySimpleResps = feignClientForActivity.queryCorpHomeActivityList(userInfoNew.getUserInfoNewOrg().getCorpId());
+            CommonResp<List<OfflineActivitySimpleResp>> activitySimpleResps = feignClientForActivity.queryCorpHomeActivityList(
+                    userInfoNew.getUserInfoNewOrg().getCorpId(), userId);
             if (activitySimpleResps.isSuccess() && CollectionUtils.isNotEmpty(activitySimpleResps.getData())) {
                 List<OfflineActivitySimpleResp> activities = activitySimpleResps.getData();
                 if (CollectionUtils.isNotEmpty(activities)) {