From ee1d39f11b9483b64a88029f1755a6e7166fea15 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期日, 26 四月 2020 16:49:21 +0800
Subject: [PATCH] 等级显示问题
---
fanli/src/main/java/com/yeshi/fanli/controller/wxmp/v1/DynamicController.java | 9 +++------
1 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/wxmp/v1/DynamicController.java b/fanli/src/main/java/com/yeshi/fanli/controller/wxmp/v1/DynamicController.java
index 09d3d8b..b4c0e72 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/wxmp/v1/DynamicController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/wxmp/v1/DynamicController.java
@@ -73,6 +73,7 @@
JSONObject data = new JSONObject();
data.put("list", gson.toJson(infoList));
data.put("count", count);
+ data.put("page",page);
out.print(JsonUtil.loadTrueResult(data));
} catch (Exception e) {
out.print(JsonUtil.loadFalseResult(1, "鑾峰彇鏁版嵁澶辫触"));
@@ -129,12 +130,7 @@
if (special.getState() == 1L) {
list.remove(i--);
} else {
- if (special.getStartTime() != null && special.getEndTime() != null)
- special.setTimeTask(true);
- else
- special.setTimeTask(false);
-
- if (special.isTimeTask()) {
+ if (special.getStartTime() != null && special.getEndTime() != null) {
if (time < special.getStartTime().getTime() || time > special.getEndTime().getTime()) {
list.remove(i--);
} else// 璁剧疆鍊掕鏃�
@@ -161,6 +157,7 @@
Gson gson = gsonBuilder.create();
JSONObject data = new JSONObject();
data.put("count", count);
+ data.put("page", page);
data.put("list", gson.toJson(list));
out.print(JsonUtil.loadTrueResult(data));
}
--
Gitblit v1.8.0