From 0a18a8cb0a7a57bf1f82df425251334c57f8c39a Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 23 一月 2021 15:40:37 +0800
Subject: [PATCH] 新增手机号/qq/微信绑定
---
src/main/java/com/yeshi/buwan/service/imp/CategoryAreaService.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/yeshi/buwan/service/imp/CategoryAreaService.java b/src/main/java/com/yeshi/buwan/service/imp/CategoryAreaService.java
index d152f7b..2c4bc6c 100644
--- a/src/main/java/com/yeshi/buwan/service/imp/CategoryAreaService.java
+++ b/src/main/java/com/yeshi/buwan/service/imp/CategoryAreaService.java
@@ -97,7 +97,7 @@
List<VideoInfo> videoList = classService.getVideoInfoData(
session.createSQLQuery(sql).setFirstResult((page - 1) * pageCount)
- .setMaxResults(pageCount).list());
+ .setMaxResults(pageCount).list(),resourceList);
if (videoList != null)
for (int i = 0; i < videoList.size(); i++) {
if (!isContainsResource(resourceList, videoList.get(i).getResourceList())) {
@@ -107,7 +107,7 @@
}
}
System.out.println("鍒楄〃鏁伴噺:" + videoList.size());
- List<VideoInfo> newVideoList = new ArrayList<VideoInfo>();
+ List<VideoInfo> newVideoList = new ArrayList<>();
if (videoList.size() > 0)
newVideoList.addAll(videoList);
return newVideoList;
@@ -120,14 +120,14 @@
});
}
- List<VideoInfo> list = new ArrayList<VideoInfo>();
+ List<VideoInfo> list = new ArrayList<>();
String sql = String.format(
"SELECT v.id,v.`name`,v.`tag`,v.`picture`,v.`hpicture`,v.`latest_hpicture`,v.watchcount,v.commentcount,temp.resources,v.`vpicture` FROM wk_video_video v LEFT JOIN wk_video_area_video_temp temp ON temp.`id`=v.`id` WHERE v.show=1 AND temp.`areas` LIKE '%s' AND temp.`typeid`=%s and v.id is not null %s",
"%" + areas + "%", type, orderby);
System.out.println(sql);
list = categoryContryDao.sqlList(sql, (page - 1) *pageCount, pageCount, null);
- List<VideoInfo> videoList = classService.getVideoInfoData(list);
+ List<VideoInfo> videoList = classService.getVideoInfoData(list,resourceList);
if (videoList != null)
for (int i = 0; i < videoList.size(); i++) {
@@ -140,14 +140,14 @@
System.out.println("鍒楄〃鏁伴噺:" + videoList.size());
- List<VideoInfo> newVideoList = new ArrayList<VideoInfo>();
+ List<VideoInfo> newVideoList = new ArrayList<>();
if (videoList.size() > 0)
newVideoList.addAll(videoList);
return newVideoList;
}
private boolean isContainsResource(List<Long> resourceList, List<VideoResource> relist) {
- List<Long> targetList = new ArrayList<Long>();
+ List<Long> targetList = new ArrayList<>();
for (VideoResource vr : relist)
targetList.add(Long.parseLong(vr.getId()));
targetList.retainAll(resourceList);
--
Gitblit v1.8.0