From 8925388132bf7c85f04802a1e32ba92448a4779f Mon Sep 17 00:00:00 2001
From: Jackwang <wt373747285@163.com>
Date: Mon, 3 Aug 2020 10:31:47 +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=E6=B7=BB=E5=8A=A0=E8=BF=9D=E8=A7=84?=
 =?UTF-8?q?=E8=AE=B0=E5=BD=95=E7=BC=96=E7=A0=81=E3=80=91-=EF=BC=88?=
 =?UTF-8?q?=E7=8E=8B=E7=AB=A5=EF=BC=89-2020/8/1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/comment/service/impl/EventCommentServiceImpl.java  | 2 +-
 .../modules/events/service/impl/EpdcEventsServiceImpl.java     | 3 +--
 .../esua/epdc/modules/item/service/impl/ItemServiceImpl.java   | 2 +-
 .../modules/comment/service/impl/TopicCommentServiceImpl.java  | 2 +-
 .../modules/topic/service/impl/TopicServiceImpl.java           | 2 +-
 .../epdc/modules/activity/service/impl/ActInfoServiceImpl.java | 2 +-
 .../activity/service/impl/ActUserClockLogServiceImpl.java      | 2 +-
 7 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/comment/service/impl/EventCommentServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/comment/service/impl/EventCommentServiceImpl.java
index bac96503e..287be84e6 100755
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/comment/service/impl/EventCommentServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/comment/service/impl/EventCommentServiceImpl.java
@@ -179,7 +179,7 @@ public class EventCommentServiceImpl extends BaseServiceImpl<EventCommentDao, Ev
                     ModuleName.ISSUE_COMMENT.getCode(), textList,null, null,contentResult,
                     null,null,mobile,"0",deptDto);
             contentSecurityFeign.insertViolationsRecord(record);
-            return new Result().error(CheckDataUtils.violations_message);
+            return new Result().error(CheckDataUtils.violations_code,CheckDataUtils.violations_message);
         }
 
         IssueEntity issueEntity = null;
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 3d702ab64..0636702dd 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
@@ -186,8 +186,7 @@ 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_message);
-//                return new Result().error(CheckDataUtils.violations_message);
+            throw new RenException(CheckDataUtils.violations_code,CheckDataUtils.violations_message);
         }
 
         EpdcEventsEntity entity = ConvertUtils.sourceToTarget(dto, EpdcEventsEntity.class);
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java
index 700325f6d..81947f1c3 100755
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java
@@ -338,7 +338,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
                         ModuleName.ITEM_SATISFACTION.getCode(), textList,null, null,contentResult,
                         null,null,mobile,"0",deptDto);
             contentSecurityFeign.insertViolationsRecord(record);
-                return new Result().error(CheckDataUtils.violations_message);
+                return new Result().error(CheckDataUtils.violations_code,CheckDataUtils.violations_message);
             }
 
             ItemEntity itemEntity = new ItemEntity();
diff --git a/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/comment/service/impl/TopicCommentServiceImpl.java b/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/comment/service/impl/TopicCommentServiceImpl.java
index e73eb84fc..931d45839 100755
--- a/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/comment/service/impl/TopicCommentServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/comment/service/impl/TopicCommentServiceImpl.java
@@ -160,7 +160,7 @@ public class TopicCommentServiceImpl extends BaseServiceImpl<TopicCommentDao, To
                     ModuleName.GROUP_TOPIC_COMMENT.getCode(), textList,null, null,contentResult,
                     null,null,mobile,"0",deptDto);
             contentSecurityFeign.insertViolationsRecord(record);
-            return new Result().error(CheckDataUtils.violations_message);
+            return new Result().error(CheckDataUtils.violations_code,CheckDataUtils.violations_message);
         }
 
         TopicCommentEntity commentEntity = new TopicCommentEntity();
diff --git a/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/topic/service/impl/TopicServiceImpl.java b/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/topic/service/impl/TopicServiceImpl.java
index 615c0ce28..05824eb61 100644
--- a/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/topic/service/impl/TopicServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/topic/service/impl/TopicServiceImpl.java
@@ -215,7 +215,7 @@ public class TopicServiceImpl extends BaseServiceImpl<TopicDao, TopicEntity> imp
                     formDto.getNickname(), CheckDataUtils.cate_two, CheckDataUtils.decision_one, ModuleName.GROUP_TOPIC.getCode(), textList,
                     formDto.getImages(), null,contentResult, imgResult,null,formDto.getMobile(),"0",deptDto);
             contentSecurityFeign.insertViolationsRecord(record);
-            return new Result().error(CheckDataUtils.violations_message);
+            return new Result().error(CheckDataUtils.violations_code,CheckDataUtils.violations_message);
         }
 
         TopicEntity entity = ConvertUtils.sourceToTarget(formDto, TopicEntity.class);
diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActInfoServiceImpl.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActInfoServiceImpl.java
index 0f4e2fbfc..9939fdd5e 100644
--- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActInfoServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActInfoServiceImpl.java
@@ -169,7 +169,7 @@ public class ActInfoServiceImpl extends BaseServiceImpl<ActInfoDao, ActInfoEntit
                     userName, CheckDataUtils.cate_one, CheckDataUtils.decision_one, ModuleName.HELP_ACTIVITY.getCode(), textList,
                     imgList, null,contentResult, imgResult,null,dto.getTel(),"0",deptDto);
             contentSecurityFeign.insertViolationsRecord(record);
-            return new Result().error(CheckDataUtils.violations_message);
+            return new Result().error(CheckDataUtils.violations_code,CheckDataUtils.violations_message);
         }
 
         ActInfoEntity entity = ConvertUtils.sourceToTarget(dto, ActInfoEntity.class);
diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActUserClockLogServiceImpl.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActUserClockLogServiceImpl.java
index 83a09229c..3c3633280 100644
--- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActUserClockLogServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActUserClockLogServiceImpl.java
@@ -330,7 +330,7 @@ public class ActUserClockLogServiceImpl extends BaseServiceImpl<ActUserClockLogD
                     userName, CheckDataUtils.cate_two, CheckDataUtils.decision_one, ModuleName.HELP_SIGNIN.getCode(), textList,
                     appActUserClockLogDTO.getImages(), null,contentResult, imgResult,null,mobile,"0",deptDto);
             contentSecurityFeign.insertViolationsRecord(record);
-            return new Result().error(CheckDataUtils.violations_message);
+            return new Result().error(CheckDataUtils.violations_code,CheckDataUtils.violations_message);
         }
         //查询人员活动关系Id(可打卡的)
         List<String> statusList = new ArrayList<>();