diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/StandardQA/controller/AskQuestionsController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/StandardQA/controller/AskQuestionsController.java index ca29ecb4..2b66f3be 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/StandardQA/controller/AskQuestionsController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/StandardQA/controller/AskQuestionsController.java @@ -132,8 +132,10 @@ public class AskQuestionsController extends BaseController { @PostMapping("/insertAskQuestions") public ResponseMessage insertAskQuestions(@RequestBody AskQuestions askQuestions){ askQuestions.setId(UUIDUtils.randomUUID20()); - askQuestions.setAppendixId(askQuestions.getFileList().get(0).getAttId()); - askQuestions.setAppendixName(askQuestions.getFileList().get(0).getName()); + if(askQuestions.getFileList()!=null && !askQuestions.getFileList().isEmpty()){ + askQuestions.setAppendixId(askQuestions.getFileList().get(0).getAttId()); + askQuestions.setAppendixName(askQuestions.getFileList().get(0).getName()); + } askQuestions.setQuestionTime(new Date()); List uId = askQuestionsDao.getUId(); List askUserList = new ArrayList<>(); @@ -146,9 +148,9 @@ public class AskQuestionsController extends BaseController { //添加问题分配人员 askUserService.saveBatch(askUserList); if(askQuestionsService.save(askQuestions)){ - return Result.success("200","添加成功"); + return Result.success("200","添加成功",null); }else { - return Result.error("-1","添加失败"); + return Result.error("-1","添加失败",null); } } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/StandardQA/controller/AskUserController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/StandardQA/controller/AskUserController.java index 05452cf4..28aeb7fe 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/StandardQA/controller/AskUserController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/StandardQA/controller/AskUserController.java @@ -29,9 +29,9 @@ public class AskUserController extends BaseController { @PostMapping("/insertAskUser") public ResponseMessage insertAskUser(@RequestBody AskUser askUser){ if(askUserService.save(askUser)){ - return Result.success("200","邀请成功"); + return Result.success("200","邀请成功",null); }else { - return Result.error("-1","添加失败"); + return Result.error("-1","添加失败",null); } } } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/StandardQA/controller/ReplyController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/StandardQA/controller/ReplyController.java index cb0f083f..2573d3ea 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/StandardQA/controller/ReplyController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/StandardQA/controller/ReplyController.java @@ -48,7 +48,7 @@ public class ReplyController extends BaseController { reply.setReplyTime(new Date()); reply.setId(UUIDUtils.randomUUID20()); if(replyService.save(reply)){ - return Result.success("200","提交成功"); + return Result.success("200","提交成功",null); }else { return Result.error("-1","添加失败"); } @@ -65,6 +65,6 @@ public class ReplyController extends BaseController { updateWrapper.eq("ID",s); replyService.update(updateWrapper); } - return Result.success("200","归档成功"); + return Result.success("200","归档成功",null); } } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/StandardQA/controller/SubscriptionController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/StandardQA/controller/SubscriptionController.java index 20582c59..f8a6ec16 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/StandardQA/controller/SubscriptionController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/StandardQA/controller/SubscriptionController.java @@ -33,12 +33,12 @@ public class SubscriptionController extends BaseController { queryWrapper.eq("USID",subscription.getUsId()); int number = subscriptionService.count(queryWrapper); if(number>0){ - return Result.success("200","此问题已订阅"); + return Result.success("200","此问题已订阅",null); } if(subscriptionService.save(subscription)){ - return Result.success("200","订阅成功"); + return Result.success("200","订阅成功",null); }else { - return Result.success("-1","订阅失败"); + return Result.success("-1","订阅失败",null); } } }