From be641cbe14bf20c807dccceb1c4b825d80443aed Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 08 一月 2020 14:42:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/controller/apph5/AppH5HelpCenterController.java | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/apph5/AppH5HelpCenterController.java b/fanli/src/main/java/com/yeshi/fanli/controller/apph5/AppH5HelpCenterController.java
index fb5042e..60a1ef3 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/apph5/AppH5HelpCenterController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/apph5/AppH5HelpCenterController.java
@@ -72,8 +72,10 @@
list.addAll(list1);
if (list.size() == 0) {
+
pageId = 0L;
} else {
+
pageId = list.get(list.size() - 1).getId();
// 鐗堟湰杩囨护
@@ -155,9 +157,11 @@
@RequestMapping(value = "getClass")
public void getClass(String callback, AcceptData acceptData, PrintWriter out) {
try {
+ List<HelpClass> resultList = new ArrayList<>();
+
List<HelpClass> list = helpClassService.getClassByState(1);
- if (list == null || list.size() == 0) {
- list = new ArrayList<>();
+ if (list != null && list.size() > 0) {
+ resultList.addAll(list);
}
// 鐗堟湰杩囨护
@@ -165,10 +169,10 @@
String platform = acceptData.getPlatform().toLowerCase();
List<AppVersionInfo> versionList = appVersionService.listByPlatformAndMinVersionCode(platform, version);
if (versionList == null || versionList.size() <= 0) {
- list.clear();
+ resultList.clear();
} else {
List<Long> sourceIdList = new ArrayList<>();
- for (HelpClass record : list) {
+ for (HelpClass record : resultList) {
sourceIdList.add(record.getId());
}
List<Long> versionIdList = new ArrayList<>();
@@ -180,12 +184,13 @@
for (int i = 0; i < list.size(); i++) {
if (!sets.contains(list.get(i).getId())) {
list.remove(i--);
+
}
}
}
JSONObject data = new JSONObject();
- data.put("class_list", JsonUtil.getApiCommonGson().toJson(list));
+ data.put("class_list", JsonUtil.getApiCommonGson().toJson(resultList));
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
} catch (Exception e) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鎿嶄綔寮傚父"));
--
Gitblit v1.8.0