Merge remote-tracking branch 'origin/test' into test

huanghongfa

2021-08-19 c40be027ef8068b9a77bb24c94291dee25f563d8

 springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/WorkGuideApi.java

@@ -2,6 +2,7 @@

import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.model.dtos.community.PageActWorkGuideDTO;
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComActWorkGuideVO;
import com.panzhihua.common.service.community.CommunityService;
@@ -31,8 +32,12 @@

    @ApiOperation(value = "办事指南_详情",response = ComActWorkGuideVO.class)
    @GetMapping("detailworkguide")
    public R detailWorkGuide(@RequestParam("workGuideId")Long workGuideId) {
        Long conmunityId = this.getLoginUserInfo().getCommunityId();
    public R detailWorkGuide(@RequestParam("workGuideId")Long workGuideId,@RequestParam(value = "conmunityId",required = false)Long communityId) {
        Long conmunityId = communityId;
        LoginUserInfoVO loginUserInfo = this.getLoginUserInfoSureNoLogin();
        if(loginUserInfo != null){
            conmunityId = loginUserInfo.getCommunityId();
        }
        return communityService.detailWorkGuide(workGuideId, conmunityId);
    }
}