From 5cefef6af110e13f63d93a9c32995fa24ff97e53 Mon Sep 17 00:00:00 2001
From: Jackwang <wt373747285@163.com>
Date: Tue, 4 Aug 2020 17:29:51 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=86=85=E5=AE=B9=E5=AE=A1=E6=A0=B8?=
 =?UTF-8?q?=E3=80=91-=E3=80=90=E5=8A=9F=E8=83=BD=E5=8D=87=E7=BA=A7-?=
 =?UTF-8?q?=E5=8F=91=E5=B8=83=E8=AE=AE=E4=BA=8B=E6=A0=BC=E5=BC=8F=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E3=80=91-=EF=BC=88=E7=8E=8B=E7=AB=A5=EF=BC=89-2020/8/?=
 =?UTF-8?q?4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../events/controller/EpdcAppEventsController.java  |  4 ++--
 .../modules/events/service/EpdcEventsService.java   |  2 +-
 .../events/service/impl/EpdcEventsServiceImpl.java  | 13 +++++++------
 3 files changed, 10 insertions(+), 9 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 ecb48316a..16b8a0272 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
@@ -36,8 +36,8 @@ public class EpdcAppEventsController {
     public Result submitEvent(@RequestBody EpdcEventSubmitFormDTO formDto) {
         //效验数据
         ValidatorUtils.validateEntity(formDto);
-        epdcEventsService.saveEvent(formDto);
-        return new Result();
+        return epdcEventsService.saveEvent(formDto);
+//        return new Result();
     }
 
     /**
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/EpdcEventsService.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/EpdcEventsService.java
index a1724d349..63f5ad863 100644
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/EpdcEventsService.java
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/EpdcEventsService.java
@@ -79,7 +79,7 @@ public interface EpdcEventsService extends BaseService<EpdcEventsEntity> {
      * @Author: liuchuang
      * @Date: 2019/9/8 16:52
      */
-    EpdcEventsEntity saveEvent(EpdcEventSubmitFormDTO dto);
+    Result saveEvent(EpdcEventSubmitFormDTO dto);
 
     void update(EpdcEventsDTO dto);
 
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/EpdcEventsServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/EpdcEventsServiceImpl.java
index 4298b0d68..b2b89540b 100644
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/EpdcEventsServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/EpdcEventsServiceImpl.java
@@ -23,7 +23,6 @@ import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl;
 import com.elink.esua.epdc.commons.tools.constant.FieldConstant;
 import com.elink.esua.epdc.commons.tools.constant.NumConstant;
 import com.elink.esua.epdc.commons.tools.constant.OrganizationTypeConstant;
-import com.elink.esua.epdc.commons.tools.exception.RenException;
 import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.commons.tools.redis.RedisKeys;
 import com.elink.esua.epdc.commons.tools.redis.RedisUtils;
@@ -172,7 +171,7 @@ public class EpdcEventsServiceImpl extends BaseServiceImpl<EpdcEventsDao, EpdcEv
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public EpdcEventsEntity saveEvent(EpdcEventSubmitFormDTO dto) {
+    public Result saveEvent(EpdcEventSubmitFormDTO dto) {
         //内容审核
         Boolean isConReview = dto.getIsConReview();
         List<String> textList = new ArrayList<>();
@@ -188,7 +187,8 @@ public class EpdcEventsServiceImpl extends BaseServiceImpl<EpdcEventsDao, EpdcEv
                     dto.getNickName(), CheckDataUtils.cate_two, CheckDataUtils.decision_one, ModuleName.ISSUE_SUBMIT.getCode(), textList,
                     dto.getImages(), null,contentResult, imgResult,null,dto.getMobile(),"0",deptDto);
             contentSecurityFeign.insertViolationsRecord(record);
-            throw new RenException(CheckDataUtils.violations_code,CheckDataUtils.violations_message);
+//            throw new RenException(CheckDataUtils.violations_code,CheckDataUtils.violations_message);
+            return new Result().error(CheckDataUtils.violations_code,CheckDataUtils.violations_message);
         }
 
         EpdcEventsEntity entity = ConvertUtils.sourceToTarget(dto, EpdcEventsEntity.class);
@@ -227,8 +227,8 @@ public class EpdcEventsServiceImpl extends BaseServiceImpl<EpdcEventsDao, EpdcEv
                 contentSecurityFeign.insertRecords(record);
             }
         }
-        return entity;
-//        return new Result<EpdcEventsEntity>().ok(entity);
+//        return entity;
+        return new Result<EpdcEventsEntity>().ok(entity);
     }
 
     @Override
@@ -552,7 +552,8 @@ public class EpdcEventsServiceImpl extends BaseServiceImpl<EpdcEventsDao, EpdcEv
         dto.setCategoryFullName(categoryInfo.getCategoryFullName());
 
         // 保存事件
-        EpdcEventsEntity eventsEntity = this.saveEvent(dto);
+        Result<EpdcEventsEntity> eventsEntityResult = this.saveEvent(dto);
+        EpdcEventsEntity eventsEntity = eventsEntityResult.getData();
         // 保存议题
         IssueEntity issueEntity = this.initIssueEntity(eventsEntity);
         issueService.insert(issueEntity);