zoujiajian 1 год назад
Родитель
Сommit
362c833b9e

+ 5 - 4
netflix-web/src/main/java/com/cyksj/web/controller/group/GroupRelationController.java

@@ -19,7 +19,6 @@ import com.cyksj.common.snowflake.Sequence;
 import com.cyksj.common.task.GlobalThreadPoolTaskExecutor;
 import com.cyksj.common.task.GlobalThreadPoolTaskExecutor;
 import com.cyksj.common.util.GoogleGenerator;
 import com.cyksj.common.util.GoogleGenerator;
 import com.cyksj.common.util.Jsons;
 import com.cyksj.common.util.Jsons;
-import com.cyksj.common.util.StringUtil;
 import com.cyksj.dto.Result;
 import com.cyksj.dto.Result;
 import com.cyksj.enums.GatewayResponse;
 import com.cyksj.enums.GatewayResponse;
 import com.cyksj.mapper.*;
 import com.cyksj.mapper.*;
@@ -493,15 +492,17 @@ public class GroupRelationController {
     @Transactional(rollbackFor = Exception.class)
     @Transactional(rollbackFor = Exception.class)
     @NoSubmit
     @NoSubmit
     public Result<String> recordQuestionnaire(@PathVariable Long promotionId, String showId, @RequestBody List<FormFieldsData> answers) {
     public Result<String> recordQuestionnaire(@PathVariable Long promotionId, String showId, @RequestBody List<FormFieldsData> answers) {
+        Long userId = StpUserUtil.getUserIdAfterLogin();
         Long groupsId = SEQUENCE.nextId();
         Long groupsId = SEQUENCE.nextId();
         List<QuestionnairePromotionFieldsListView> promotionFieldsListViews = beanSearcher.searchAll(QuestionnairePromotionFieldsListView.class, MapUtils.builder().field(QuestionnairePromotionFieldsListView::getPromotionId, promotionId).build());
         List<QuestionnairePromotionFieldsListView> promotionFieldsListViews = beanSearcher.searchAll(QuestionnairePromotionFieldsListView.class, MapUtils.builder().field(QuestionnairePromotionFieldsListView::getPromotionId, promotionId).build());
         if (CollUtil.isEmpty(promotionFieldsListViews)) throw BusinessRuntimeException.getInstance("问卷已结束");
         if (CollUtil.isEmpty(promotionFieldsListViews)) throw BusinessRuntimeException.getInstance("问卷已结束");
         if (promotionFieldsListViews.size() != answers.size()) throw BusinessRuntimeException.getInstance("请完成所有问题");
         if (promotionFieldsListViews.size() != answers.size()) throw BusinessRuntimeException.getInstance("请完成所有问题");
         log.info("开始记录问卷:{}", promotionId);
         log.info("开始记录问卷:{}", promotionId);
         answers.forEach(answer -> {
         answers.forEach(answer -> {
-            if (StringUtil.isNotBlank(showId)) {
-                answer.setUserId(userService.getUserIdByShowId(showId));
-            }
+//            if (StringUtil.isNotBlank(showId)) {
+//                answer.setUserId(userService.getUserIdByShowId(showId));
+//            }
+            answer.setUserId(userId);
             Long fieldsId = answer.getFieldsId();
             Long fieldsId = answer.getFieldsId();
             String content = answer.getContent();
             String content = answer.getContent();
             if (fieldsId == null || StrUtil.isBlank(content)) {
             if (fieldsId == null || StrUtil.isBlank(content)) {