From b1cb20ab657cfa088b5bd162f27cd34e9a037b3d Mon Sep 17 00:00:00 2001 From: luozukai Date: Tue, 9 Apr 2019 12:37:35 +0800 Subject: [PATCH] =?UTF-8?q?[=E6=B6=88=E6=81=AF=E7=BB=84=E4=BB=B6][?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0][=E6=B7=BB=E5=8A=A0=E8=B4=A6=E5=8D=95?= =?UTF-8?q?=E9=82=AE=E4=BB=B6=E9=80=9A=E7=9F=A5]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/iformall/controller/WxTopicController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxTopicController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxTopicController.java index 029ba3833..97572d7f5 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxTopicController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxTopicController.java @@ -46,7 +46,7 @@ public class WxTopicController extends BaseController { String tenantId = getTenantId(); wxTopic.setTenantId(tenantId); WxTopic queryTopic = wxTopicService.findById(wxTopic); - if (queryTopic.getEndTime()!=null && new Date().getTime() > queryTopic.getEndTime().getTime()) { + if (queryTopic!=null && queryTopic.getEndTime()!=null && new Date().getTime() > queryTopic.getEndTime().getTime()) { queryTopic.setStatus(EnumWxTopicStatus.INVAILD.getCode()); } return new ResultData(queryTopic);