Merge remote-tracking branch 'origin/master'

puzhibing

2023-08-01 883d16070288862180dd65fc58e7927f9040a30d

 cloud-server-activity/src/main/java/com/dsh/activity/controller/BenefitVideoController.java

@@ -69,15 +69,16 @@
            @ApiImplicitParam(value = "视频分类id", name = "classificationId", dataType = "int", required = true),
            @ApiImplicitParam(value = "页码，首页1", name = "pageSize", dataType = "int", required = true),
            @ApiImplicitParam(value = "页条数", name = "pageNo", dataType = "int", required = true),
            @ApiImplicitParam(value = "搜索内容", name = "search", dataType = "string", required = false),
            @ApiImplicitParam(name = "Authorization", value = "用户token（Bearer +token）", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
    })
    public ResultUtil<List<BenefitsVideosListVo>> queryBenefitsVideosList(Integer classificationId, Integer pageSize, Integer pageNo){
    public ResultUtil<List<BenefitsVideosListVo>> queryBenefitsVideosList(Integer classificationId, String search, Integer pageSize, Integer pageNo){
        try {
            Integer uid = tokenUtil.getUserIdFormRedis();
            if(null == uid){
                return ResultUtil.tokenErr();
            }
            List<BenefitsVideosListVo> benefitsVideosListVos = bfvService.queryBenefitsVideosList(uid, classificationId, pageSize, pageNo);
            List<BenefitsVideosListVo> benefitsVideosListVos = bfvService.queryBenefitsVideosList(uid, classificationId, search, pageSize, pageNo);
            return ResultUtil.success(benefitsVideosListVos);
        }catch (Exception e){
            e.printStackTrace();