1、查询视频接口合并

jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/travelController/IndexApiController.java

@@ -33,12 +33,12 @@ public class IndexApiController {
         return indexApiService.queryBannerList(bannerCategoryType);
     };
 
-    //获取视频列表
-    @ApiOperation(value="小程序-获取视频列表", notes="小程序-获取视频列表")
-    @RequestMapping(value = "/queryVideoList", method = {RequestMethod.GET})
-    public Result<?> queryVideoList(PageBean pageBean){
-        return indexApiService.queryVideoList(pageBean);
-    }
+//    //获取视频列表
+//    @ApiOperation(value="小程序-获取视频列表", notes="小程序-获取视频列表")
+//    @RequestMapping(value = "/queryVideoList", method = {RequestMethod.GET})
+//    public Result<?> queryVideoList(PageBean pageBean){
+//        return indexApiService.queryVideoList(pageBean);
+//    }
 
 //    //获取文章列表-申遗历程/非遗体验
 //    @ApiOperation(value="小程序-获取文章列表", notes="小程序-获取文章列表")
@@ -98,7 +98,7 @@ public class IndexApiController {
 
     //根据角色id获取视频列表
     @ApiOperation(value="小程序-根据角色id获取视频列表", notes="小程序-根据角色id获取视频列表")
-    @RequestMapping(value = "/queryVedioBySpot", method = {RequestMethod.GET})
+    @RequestMapping(value = "/queryVedioById", method = {RequestMethod.GET})
     public Result<?> queryVedioById(String roleInfoId, PageBean pageBean){
         return indexApiService.queryVedioById(roleInfoId, pageBean);
     }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/IndexApiServiceImpl.java

@@ -339,16 +339,26 @@ public class IndexApiServiceImpl implements IndexApiService {
         return Result.OK("角色详情", one);
     }
 
-    //根据视频创建者获取视频列表
+    //获取视频列表
     @Override
     public Result<?> queryVedioById(String roleInfoId, PageBean pageBean) {
 
         Page<TravelVideo> page = new Page<TravelVideo>(pageBean.getPageNo(), pageBean.getPageSize());
-        Page<TravelVideo> pageList = travelVideoService
-                .lambdaQuery()
-                .eq(TravelVideo::getCreateBy, roleInfoId)
-                .orderByDesc(TravelVideo::getCreateTime)
-                .page(page);
+        Page<TravelVideo> pageList;
+
+        if(null != roleInfoId){
+            pageList = travelVideoService
+                    .lambdaQuery()
+                    .eq(TravelVideo::getCreateBy, roleInfoId)
+                    .orderByDesc(TravelVideo::getCreateTime)
+                    .page(page);
+        }else {
+            pageList = travelVideoService
+                    .lambdaQuery()
+                    .orderByDesc(TravelVideo::getCreateTime)
+                    .page(page);
+        }
+
 
         return Result.OK("视频列表", pageList);
     }