From 6096b7a10e225bccc4530840e82e53ab70861d2c Mon Sep 17 00:00:00 2001 From: hupeng Date: Mon, 10 Dec 2018 12:28:32 +0800 Subject: [PATCH] =?UTF-8?q?[C=E7=AB=AF][=E4=BF=AE=E5=A4=8D]:C=E7=AB=AF?= =?UTF-8?q?=E7=AD=94=E9=A2=98=E9=97=AE=E5=88=B8=E7=A9=BA=E9=80=89=E6=97=B6?= =?UTF-8?q?=E5=90=8E=E7=AB=AF=E6=9F=A5=E8=AF=A2=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/iformall/controller/WxQuestionController.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxQuestionController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxQuestionController.java index 683324df0..cd8da56eb 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxQuestionController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxQuestionController.java @@ -41,7 +41,7 @@ public class WxQuestionController extends BaseController { @ApiOperation("查寻问券") @GetMapping("getQuestion") - public Result getQuestion(String couponType) { + public Result getQuestion(@RequestParam("couponType") String couponType) { WxQuestionConfig wxQuestionConfig = new WxQuestionConfig(); wxQuestionConfig.setTenantId(getTenantId()); JSONArray ct = new JSONArray(); @@ -50,10 +50,12 @@ public class WxQuestionController extends BaseController { List listConfig = wxQuestionService.findConfigList(wxQuestionConfig); if (listConfig.size() > 0) { wxQuestionConfig = listConfig.get(0); - if (listConfig.get(0).getStatus().equals(EnumQuestionConfigStatus.ON.getCode())) { + List questionIds = JSONObject.parseArray(wxQuestionConfig.getQuestionList(), Long.class); + if (wxQuestionConfig.getStatus().equals(EnumQuestionConfigStatus.ON.getCode()) + && questionIds.size() > 0) { WxQuestion wxQuestion = new WxQuestion(); wxQuestion.setTenantId(getTenantId()); - wxQuestion.setIds(JSONObject.parseArray(wxQuestionConfig.getQuestionList(), Long.class)); + wxQuestion.setIds(questionIds); List listQuestion = wxQuestionService.findList(wxQuestion); if (listQuestion.size() > 0) { Iterator q = listQuestion.iterator();