From 348cd271e289045d7cdbb174f91dfe4bcb2fa88e Mon Sep 17 00:00:00 2001 From: songyunpeng Date: Thu, 6 Aug 2020 18:04:01 +0800 Subject: [PATCH] =?UTF-8?q?=E5=86=85=E5=AE=B9=E7=AE=A1=E7=90=86BUG?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/events/controller/EpdcAppEventsController.java | 5 ++++- .../epdc/modules/activity/controller/ActInfoController.java | 3 +-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/controller/EpdcAppEventsController.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/controller/EpdcAppEventsController.java index 661a4d3e..07e55be8 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/controller/EpdcAppEventsController.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/controller/EpdcAppEventsController.java @@ -41,7 +41,10 @@ public class EpdcAppEventsController { //效验数据 ValidatorUtils.validateEntity(formDto); Result epdcEventsEntityResult = epdcEventsService.saveEvent(formDto); - return new Result().ok(epdcEventsEntityResult.getData().getId()); + if(epdcEventsEntityResult!=null && epdcEventsEntityResult.success()){ + return new Result().ok(epdcEventsEntityResult.getData().getId()); + } + return epdcEventsEntityResult; } /** diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/controller/ActInfoController.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/controller/ActInfoController.java index 09007ecf..ccda72d3 100644 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/controller/ActInfoController.java +++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/controller/ActInfoController.java @@ -91,8 +91,7 @@ public class ActInfoController { public Result update(@RequestBody ActInfoDTO dto){ //效验数据 ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); - actInfoService.update(dto); - return new Result(); + return actInfoService.updateWithContent(dto); } /**