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

yanghui

2022-11-17 1de0a85c067ceb62413d0f458899dca41b8322d0

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComSanShuoEventController.java

@@ -14,6 +14,7 @@
import com.panzhihua.common.utlis.CopyUtil;
import com.panzhihua.common.utlis.StringUtils;
import com.panzhihua.service_community.entity.ComEvent;
import com.panzhihua.service_community.service.ComSanShuoExpertService;
import com.panzhihua.service_community.service.IComEventService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
@@ -50,6 +51,8 @@
    private IComEventService comEventService;
    @Resource
    private UserService userService;
    @Resource
    private ComSanShuoExpertService comSanShuoExpertService;


    /**
@@ -165,9 +168,13 @@
        Page pagination = new Page(pageNo, pageSize);
        ComEvent comEvent=new ComEvent();
        BeanUtils.copyProperties(comEventVO, comEvent);
        log.info("==================参数vo"+comEventVO);
        log.info("==================参数comEvent"+comEvent);
        LoginUserInfoVO loginUserInfo = getLoginUserInfo();
        String appId = userService.detailUser(loginUserInfo.getUserId()).getData().getAppId();
        comEvent.setAppId(appId);
        if (isNull(comEventVO.getAppId())){
            String appId = userService.detailUser(loginUserInfo.getUserId()).getData().getAppId();
            comEvent.setAppId(appId);
        }
        return comEventService.pageByComEvent(comEvent, pagination,this.getLoginUserInfo());
    }

@@ -366,4 +373,12 @@
        return comEventService.listCommunityScreen();
    }

    /**
     * 获取事件范围筛选列表
     * */
    @GetMapping("/rangeList")
    public R rangeList(){
        return comSanShuoExpertService.rangeList();
    }

}