From 0b7d54a76830839f4b33dfe00723b30a625006c6 Mon Sep 17 00:00:00 2001
From: Augcl <17674666882@163.com>
Date: Fri, 11 Oct 2024 00:03:31 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E8=A7=86=E9=A2=91=E7=82=B9=E8=B5=9E?=
 =?UTF-8?q?=E5=88=A4=E6=96=AD=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../org/jeecg/modules/apiService/impl/IndexApiServiceImpl.java     | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/IndexApiServiceImpl.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/IndexApiServiceImpl.java
index 183f571..d3f29d6 100644
--- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/IndexApiServiceImpl.java
+++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/IndexApiServiceImpl.java
@@ -538,7 +538,7 @@ public class IndexApiServiceImpl implements IndexApiService {
     public Result<?> queryVedioById(String token, String roleInfoId, PageBean pageBean) {
         //如果用户是登录状态，查询该用户的点赞列表
         List<TravelThumpup> thumpupList = null;
-        if(null != token){
+        if(null != token && "" != token){
             HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
             thumpupList = travelThumpupService
                     .lambdaQuery()
@@ -596,6 +596,7 @@ public class IndexApiServiceImpl implements IndexApiService {
         }
 
         //分页
+        List<VideoApiBean> videoApiBeanListPage = new ArrayList<>();
         //页码
         int pageNo = pageBean.getPageNo();
         //每一页展示数量
@@ -603,7 +604,7 @@ public class IndexApiServiceImpl implements IndexApiService {
         //数据总量
         int listCount = videoApiBeanList.size();
         if(listCount < 1){
-            return Result.OK("没有视频数据");
+            return Result.OK("没有视频数据",videoApiBeanListPage);
         }
         //总页数
         int pageCount = listCount%pageSize==0?listCount/pageSize:listCount/pageSize+1;
@@ -622,7 +623,7 @@ public class IndexApiServiceImpl implements IndexApiService {
             endIndex = listCount;
         }
 
-        List<VideoApiBean> videoApiBeanListPage = videoApiBeanList.subList(startIndex,endIndex);
+        videoApiBeanListPage = videoApiBeanList.subList(startIndex,endIndex);
 
         return Result.OK("视频列表", videoApiBeanListPage);
     }