Merge branch 'dev' into 'master'

修改使用batchInsert批量插入方法keywords字段保存不了

See merge request !12

cloud-research-service/src/main/java/com/yizhi/research/application/service/impl/TrResearchQuestionServiceImpl.java

@@ -106,8 +106,13 @@ public class TrResearchQuestionServiceImpl extends ServiceImpl<TrResearchQuestio
                 }
                 }
             }
             }
         }
         }
+        
+        //修改使用batchInsert插入时候keywords字段保存不了
+        int num = 0;
+        for (TrResearchQuestion question : researchQuestions) {
+        	 num += researchQuestionMapper.insert(question);
+        }
 
 
-        int num = researchQuestionMapper.batchInsert(researchQuestions);
         if (num > 0 && hasOptions) {
         if (num > 0 && hasOptions) {
             researchQuestionOptionMapper.batchInsert(optionListToInsert);
             researchQuestionOptionMapper.batchInsert(optionListToInsert);
         }
         }
@@ -317,7 +322,12 @@ public class TrResearchQuestionServiceImpl extends ServiceImpl<TrResearchQuestio
         }
         }
 
 
         if (!CollectionUtils.isEmpty(newQuestions) && !needChangeNo) {
         if (!CollectionUtils.isEmpty(newQuestions) && !needChangeNo) {
-            result += researchQuestionMapper.batchInsert(newQuestions);
+        	//result += researchQuestionMapper.batchInsert(newQuestions);
+            //修改使用batchInsert插入时候keywords字段保存不了 
+            for (TrResearchQuestion question : newQuestions) {
+            	result += researchQuestionMapper.insert(question);
+            }
+            
         }
         }
         if (!CollectionUtils.isEmpty(newOptions)) {
         if (!CollectionUtils.isEmpty(newOptions)) {
             researchQuestionOptionMapper.batchInsert(newOptions);
             researchQuestionOptionMapper.batchInsert(newOptions);