解决冲突

src/main/java/org/rcisoft/business/tquestion/controller/TQuestionController.java

@@ -42,18 +42,8 @@ public class TQuestionController extends PaginationController<TQuestion> {
     //@ApiImplicitParams({@ApiImplicitParam(name = "businessId", value = "businessId", required = false, dataType = "varchar")})
     @PostMapping
     @PreAuthorize("hasRole('ROLE_1002')")
-<<<<<<< .merge_file_oAfXkc
-    public Result add(@Valid TQuestion tQuestion, BindingResult bindingResult) {
-        if (bindingResult.hasErrors()) {
-            throw new ServiceException(ResultServiceEnums.PARAMETER_ERROR.getCode(),
-                bindingResult.getFieldError().getDefaultMessage());
-        }
-        tQuestion.setToken(getToken());
-        PersistModel data = tQuestionServiceImpl.save(tQuestion);
-=======
     public Result add(@Valid TQuestion tQuestion, String[] questionOptions) {
         PersistModel data = tQuestionServiceImpl.save(tQuestion,questionOptions);
->>>>>>> .merge_file_cs5OSX
         return Result.builder(data,
             MessageConstant.MESSAGE_ALERT_SUCCESS,
             MessageConstant.MESSAGE_ALERT_ERROR,

src/main/java/org/rcisoft/business/tquestion/dao/TQuestionRepository.java

@@ -42,14 +42,11 @@ public interface TQuestionRepository extends BaseMapper<TQuestion> {
             +"where 1=1"
             +"<if test=\"delFlag !=null and delFlag != '' \">and del_flag = #{delFlag} </if> "
             +"<if test=\"flag !=null and flag != '' \">and flag = #{flag} </if> "
-<<<<<<< .merge_file_ontliA
-            +"<if test=\"business_id != null and business_id != ''\">and business_id = #{business_id}</if><script>")
-=======
+
             +"<if test=\"business_id != null and business_id != ''\">and business_id = #{business_id}</if></script>")
->>>>>>> .merge_file_LlwUcr
     List<TQuestion> queryTQuestions(TQuestion tQuestion);
 
-    @Update("<script> update t_question set del_flag = 1 and flag = 0 where FIND_IN_SET(business_id,idInfoList)<script>")
+    @Update("<script> update t_question set del_flag = 1 and flag = 0 where FIND_IN_SET(business_id,idInfoList)</script>")
     int deleteByIds(String idInfoList);
 }