diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxActivityJoinController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxActivityJoinController.java index fe3e74209..1dae8fdcb 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxActivityJoinController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxActivityJoinController.java @@ -1,22 +1,28 @@ package com.iformall.controller; +import com.alibaba.fastjson.JSONArray; import com.github.pagehelper.PageInfo; import com.iformall.common.ErrorCode; import com.iformall.common.ResultData; import com.iformall.domain.po.BaseEntity; import com.iformall.domain.po.WxActivity; import com.iformall.domain.po.WxActivityJoin; +import com.iformall.domain.vo.WxActivityJoinQuestionAnswer; import com.iformall.exception.MallinkException; import com.iformall.service.WxActivityJoinService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; +import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import java.util.List; +import java.util.stream.Collectors; + /** * @author gongbiao */ @@ -52,6 +58,12 @@ public class WxActivityJoinController extends BaseController { wxActivityJoin.setTenantId(getTenantId()); wxActivityJoin.setUserId(getUserId()); wxActivityJoin.setNickName(getUser().getNickName()); + if (StringUtils.isNotEmpty(wxActivityJoin.getAnswer())) { + List wxActivityJoinQuestionAnswers = JSONArray.parseArray(wxActivityJoin.getAnswer(), WxActivityJoinQuestionAnswer.class); + List collect = wxActivityJoinQuestionAnswers.stream().filter(answer -> answer != null).collect(Collectors.toList()); + String answer = JSONArray.toJSONString(collect); + wxActivityJoin.setAnswer(answer); + } try { return wxActivityJoinService.join(wxActivityJoin); } catch (MallinkException e) {