From 31c60dfbfc5bba27da4fb89cc50b7625297c5544 Mon Sep 17 00:00:00 2001 From: hupeng Date: Fri, 26 Oct 2018 17:30:46 +0800 Subject: [PATCH] =?UTF-8?q?[=E9=97=AE=E5=88=B8][=E4=BF=AE=E5=A4=8D]:?= =?UTF-8?q?=E4=B8=8D=E5=9B=9E=E7=AD=94=E8=AE=B0=E5=BD=95,=E4=B8=8D?= =?UTF-8?q?=E5=9B=9E=E7=AD=94=E9=87=8D=E5=A4=8D=E9=97=AE=E7=AD=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/WxQuestionController.java | 16 ++++++++++------ .../com/iformall/mapper/WxQuestionLogMapper.java | 2 +- .../service/impl/WxQuestionServiceImpl.java | 2 +- .../resources/mapper/WxQuestionLogMapper.xml | 3 ++- 4 files changed, 14 insertions(+), 9 deletions(-) diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxQuestionController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxQuestionController.java index f94e3830f..995b68aff 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxQuestionController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxQuestionController.java @@ -73,20 +73,24 @@ public class WxQuestionController extends BaseController { @ApiOperation("设置问券配置") @PostMapping("/api/answerQuestion") public Result answerQuestion(@RequestBody WxQuestionLog wxQuestionLog) { - if (wxQuestionLog == null) + if (wxQuestionLog == null) return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); if (wxQuestionLog.getQuestionId() == null) return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); if (wxQuestionLog.getAnswer() == null) return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); - String[] arys1 = wxQuestionLog.getAnswer().split(","); - List as = new ArrayList<>(); - for (int i = 0; i < arys1.length; i++) { - as.add(Long.parseLong(arys1[i])); + if (wxQuestionLog.getAnswer().isEmpty()) { + wxQuestionLog.setAnswer(null); + } else { + String[] arys1 = wxQuestionLog.getAnswer().split(","); + List as = new ArrayList<>(); + for (int i = 0; i < arys1.length; i++) { + as.add(Long.parseLong(arys1[i])); + } + wxQuestionLog.setAnswer(JSONObject.toJSONString(as)); } - wxQuestionLog.setAnswer(JSONObject.toJSONString(as)); wxQuestionLog.setUserId(getUserId()); wxQuestionService.saveOrUpdateLog(wxQuestionLog); diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxQuestionLogMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxQuestionLogMapper.java index ace1e33b5..13e6c7211 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxQuestionLogMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxQuestionLogMapper.java @@ -7,5 +7,5 @@ import java.util.List; public interface WxQuestionLogMapper extends CommonMapper { - List findList(WxQuestionLog wxQuestionLog); + List findListWithAnswer(WxQuestionLog wxQuestionLog); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxQuestionServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxQuestionServiceImpl.java index ed0405214..0b53dd8c0 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxQuestionServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxQuestionServiceImpl.java @@ -70,7 +70,7 @@ public class WxQuestionServiceImpl implements WxQuestionService { @Override public List findLogList(WxQuestionLog wxQuestionLog) { - return wxQuestionLogMapper.findList(wxQuestionLog); + return wxQuestionLogMapper.findListWithAnswer(wxQuestionLog); } @Override diff --git a/mallinkService/src/main/resources/mapper/WxQuestionLogMapper.xml b/mallinkService/src/main/resources/mapper/WxQuestionLogMapper.xml index 45576a535..92f5510d8 100644 --- a/mallinkService/src/main/resources/mapper/WxQuestionLogMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxQuestionLogMapper.xml @@ -60,11 +60,12 @@ order by ${sortColumns} - select from wx_question_log + and `answer` is not null