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 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 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 videoApiBeanListPage = videoApiBeanList.subList(startIndex,endIndex); + videoApiBeanListPage = videoApiBeanList.subList(startIndex,endIndex); return Result.OK("视频列表", videoApiBeanListPage); }