diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxTopicController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxTopicController.java index cc443bd25..6e3c83b41 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxTopicController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxTopicController.java @@ -48,9 +48,6 @@ public class WxTopicController extends BaseController { String tenantId = getTenantId(); wxTopic.setTenantId(tenantId); WxTopic queryTopic = wxTopicService.findById(wxTopic); - if (queryTopic!=null && queryTopic.getEndTime()!=null && new Date().getTime() > queryTopic.getEndTime().getTime()) { - queryTopic.setStatus(EnumWxTopicStatus.INVAILD.getCode()); - } return new ResultData(queryTopic); } diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxTopicController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxTopicController.java index ef3ccc57e..4bd3ad547 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxTopicController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxTopicController.java @@ -9,6 +9,7 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; + @RestController @RequestMapping("/api/topic") @Api(description = "专题相关接口") @@ -26,5 +27,12 @@ public class WxTopicController extends BaseController { return new ResultData(wxTopicService.show(wxTopic)); } - + @GetMapping("findById") + public ResultData findById(WxTopic wxTopic) { + logger.debug("[" + getIpAddr() + "] WxTopicController::findById"); + String tenantId = getTenantId(); + wxTopic.setTenantId(tenantId); + WxTopic queryTopic = wxTopicService.findById(wxTopic); + return new ResultData(queryTopic); + } }