From 123a3e8790751a82276f2da01cbbd480fab996bf Mon Sep 17 00:00:00 2001 From: 101captain <237651143@qq.com> Date: 星期日, 24 七月 2022 15:34:07 +0800 Subject: [PATCH] bug修改 --- springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/PartyBuildingApi.java | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/PartyBuildingApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/PartyBuildingApi.java index 79dfdd1..a6aeecf 100644 --- a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/PartyBuildingApi.java +++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/PartyBuildingApi.java @@ -10,6 +10,7 @@ import com.panzhihua.common.model.vos.grid.EventGridCommunityAdminVO; import com.panzhihua.common.service.community.CommunityService; import com.panzhihua.common.service.partybuilding.ComPbCheckUnitFeign; +import com.panzhihua.common.service.partybuilding.PartyBuildingWestService; import org.springframework.util.ObjectUtils; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -47,6 +48,8 @@ @Resource private PartyBuildingService partyBuildingService; @Resource + private PartyBuildingWestService partyBuildingWestService; + @Resource private UserService userService; @Resource private CheckService checkService; @@ -73,7 +76,7 @@ return R.fail("类型不能为空"); } partyBuildingComPbDynVO.setStatus(2); - return partyBuildingService.pageYnamic(partyBuildingComPbDynVO); + return partyBuildingWestService.pageYnamic(partyBuildingComPbDynVO); } @ApiOperation(value = "分页查询党员活动", response = PageActivityMembersVO.class) @@ -301,7 +304,7 @@ @ApiOperation(value = "查询当前用户党员信息") @GetMapping("/getPartyMember") public R getPartyMember(@RequestParam("type")Integer type){ - return partyBuildingService.getPartyMember(this.getUserId(),type); + return partyBuildingService.getPartyMember(this.getLoginUserInfo().getPhone(),type); } @ApiOperation(value = "查询报道单位详情") @GetMapping("/comPbCheckUnit/detailByPhone") -- Gitblit v1.7.1