From f792b7cee260bc46a38eaaa80b02b51dfdc168f8 Mon Sep 17 00:00:00 2001
From: Jackwang <wt373747285@163.com>
Date: Fri, 17 Jul 2020 10:02:45 +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=BE=85=E5=AE=A1=E6=A0=B8=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E9=9D=9E=E7=A9=BA=E5=88=A4=E6=96=AD=E3=80=91-?=
 =?UTF-8?q?=EF=BC=88=E7=8E=8B=E7=AB=A5=EF=BC=89-2020/07/17?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/EventCommentServiceImpl.java    | 14 ++++++++------
 .../service/impl/EpdcEventsServiceImpl.java      | 14 ++++++++------
 .../item/service/impl/ItemServiceImpl.java       | 16 +++++++++-------
 .../service/impl/TopicCommentServiceImpl.java    | 15 ++++++++-------
 .../topic/service/impl/TopicServiceImpl.java     | 16 +++++++++-------
 .../service/impl/ActInfoServiceImpl.java         | 14 ++++++++------
 .../service/impl/ActUserClockLogServiceImpl.java | 14 ++++++++------
 7 files changed, 58 insertions(+), 45 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 41657e8a9..0e9a869f3 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
@@ -283,13 +283,15 @@ public class EventCommentServiceImpl extends BaseServiceImpl<EventCommentDao, Ev
         }
 
         //判断是否为待审核
-        CheckResultMessageDTO twoTypes = CheckDataUtils.checkTwoTypes(contentResult, null);
-        if (CheckDataUtils.review.equals(twoTypes.getSuggestion())) {
-            //组装要保存的信息
-            SaveCheckRecordsDTO record = CheckDataUtils.getPackageRecords(commentFormDTO.getUserId(),
-                    commentFormDTO.getUserName(), CheckDataUtils.cate_two, null, ModuleName.ISSUE_COMMENT.getCode(), textList,
-                     null,commentEntity.getId(), null,null,twoTypes,mobile,"0");
+        if (contentResult != null) {
+            CheckResultMessageDTO twoTypes = CheckDataUtils.checkTwoTypes(contentResult, null);
+            if (CheckDataUtils.review.equals(twoTypes.getSuggestion())) {
+                //组装要保存的信息
+                SaveCheckRecordsDTO record = CheckDataUtils.getPackageRecords(commentFormDTO.getUserId(),
+                        commentFormDTO.getUserName(), CheckDataUtils.cate_two, null, ModuleName.ISSUE_COMMENT.getCode(), textList,
+                        null,commentEntity.getId(), null,null,twoTypes,mobile,"0");
                 contentSecurityFeign.insertRecords(record);
+            }
         }
         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/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 e32b2af66..aa00092a3 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
@@ -208,13 +208,15 @@ public class EpdcEventsServiceImpl extends BaseServiceImpl<EpdcEventsDao, EpdcEv
         }
 
         //保存待审核记录
-        CheckResultMessageDTO twoTypes = CheckDataUtils.checkTwoTypes(contentResult, imgResult);
-        if (CheckDataUtils.review.equals(twoTypes.getSuggestion())) {
-            //组装要保存的信息
-            SaveCheckRecordsDTO record = CheckDataUtils.getPackageRecords(dto.getUserId(),
-                    dto.getNickName(), CheckDataUtils.cate_two, null,ModuleName.ISSUE_SUBMIT.getCode(), textList,
-                    dto.getImages(), entity.getId(),null,null, twoTypes,dto.getMobile(),"0");
+        if (contentResult != null && imgResult != null) {
+            CheckResultMessageDTO twoTypes = CheckDataUtils.checkTwoTypes(contentResult, imgResult);
+            if (CheckDataUtils.review.equals(twoTypes.getSuggestion())) {
+                //组装要保存的信息
+                SaveCheckRecordsDTO record = CheckDataUtils.getPackageRecords(dto.getUserId(),
+                        dto.getNickName(), CheckDataUtils.cate_two, null, ModuleName.ISSUE_SUBMIT.getCode(), textList,
+                        dto.getImages(), entity.getId(), null, null, twoTypes, dto.getMobile(), "0");
                 contentSecurityFeign.insertRecords(record);
+            }
         }
         return entity;
     }
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 c6eead2a7..bdfcdf16f 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
@@ -354,13 +354,15 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
             }
 
             //判断是否为待审核
-            CheckResultMessageDTO twoTypes = CheckDataUtils.checkTwoTypes(contentResult, null);
-            if (CheckDataUtils.review.equals(twoTypes.getSuggestion())) {
-                //组装要保存的信息
-                SaveCheckRecordsDTO record = CheckDataUtils.getPackageRecords(evaluationFormDTO.getUserId(),
-                        userName, CheckDataUtils.cate_two, null, ModuleName.ITEM_SATISFACTION.getCode(), textList,
-                        null,itemEntity.getId(), null,null,twoTypes,mobile,"0");
-                contentSecurityFeign.insertRecords(record);
+            if(contentResult != null) {
+                CheckResultMessageDTO twoTypes = CheckDataUtils.checkTwoTypes(contentResult, null);
+                if (CheckDataUtils.review.equals(twoTypes.getSuggestion())) {
+                    //组装要保存的信息
+                    SaveCheckRecordsDTO record = CheckDataUtils.getPackageRecords(evaluationFormDTO.getUserId(),
+                            userName, CheckDataUtils.cate_two, null, ModuleName.ITEM_SATISFACTION.getCode(), textList,
+                            null,itemEntity.getId(), null,null,twoTypes,mobile,"0");
+                    contentSecurityFeign.insertRecords(record);
+                }
             }
             return new Result();
         } else {
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 baccc62cd..b23a78071 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
@@ -225,15 +225,16 @@ public class TopicCommentServiceImpl extends BaseServiceImpl<TopicCommentDao, To
         }
 
         //判断是否为待审核
-        CheckResultMessageDTO twoTypes = CheckDataUtils.checkTwoTypes(contentResult, null);
-        if (CheckDataUtils.review.equals(twoTypes.getSuggestion())) {
-            //组装要保存的信息
-            SaveCheckRecordsDTO record = CheckDataUtils.getPackageRecords(commentFormDTO.getUserId(),
-                    commentFormDTO.getUserName(), CheckDataUtils.cate_two, null, ModuleName.GROUP_TOPIC_COMMENT.getCode(), textList,
-                    null,commentEntity.getId(), null,null,twoTypes,mobile,"0");
+        if (contentResult != null) {
+            CheckResultMessageDTO twoTypes = CheckDataUtils.checkTwoTypes(contentResult, null);
+            if (CheckDataUtils.review.equals(twoTypes.getSuggestion())) {
+                //组装要保存的信息
+                SaveCheckRecordsDTO record = CheckDataUtils.getPackageRecords(commentFormDTO.getUserId(),
+                        commentFormDTO.getUserName(), CheckDataUtils.cate_two, null, ModuleName.GROUP_TOPIC_COMMENT.getCode(), textList,
+                        null, commentEntity.getId(), null, null, twoTypes, mobile, "0");
                 contentSecurityFeign.insertRecords(record);
+            }
         }
-
         return new Result();
     }
 
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 81df72612..74337515b 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
@@ -243,13 +243,15 @@ public class TopicServiceImpl extends BaseServiceImpl<TopicDao, TopicEntity> imp
                 contentSecurityFeign.insertRecords(record);
             }
             //保存待审核记录
-            CheckResultMessageDTO twoTypes = CheckDataUtils.checkTwoTypes(contentResult, imgResult);
-            if (CheckDataUtils.review.equals(twoTypes.getSuggestion())) {
-                //组装要保存的信息
-                SaveCheckRecordsDTO record = CheckDataUtils.getPackageRecords(formDto.getUserId(),
-                        formDto.getNickname(), CheckDataUtils.cate_two, null,ModuleName.GROUP_TOPIC.getCode(), textList,
-                        formDto.getImages(), entity.getId(),null,null, twoTypes,formDto.getMobile(),"0");
-                contentSecurityFeign.insertRecords(record);
+            if (contentResult != null && imgResult != null) {
+                CheckResultMessageDTO twoTypes = CheckDataUtils.checkTwoTypes(contentResult, imgResult);
+                if (CheckDataUtils.review.equals(twoTypes.getSuggestion())) {
+                    //组装要保存的信息
+                    SaveCheckRecordsDTO record = CheckDataUtils.getPackageRecords(formDto.getUserId(),
+                            formDto.getNickname(), CheckDataUtils.cate_two, null,ModuleName.GROUP_TOPIC.getCode(), textList,
+                            formDto.getImages(), entity.getId(),null,null, twoTypes,formDto.getMobile(),"0");
+                    contentSecurityFeign.insertRecords(record);
+                }
             }
 
             return new Result();
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 30ac16ff0..c48d069ab 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
@@ -186,13 +186,15 @@ public class ActInfoServiceImpl extends BaseServiceImpl<ActInfoDao, ActInfoEntit
         }
 
         //保存待审核记录
-        CheckResultMessageDTO twoTypes = CheckDataUtils.checkTwoTypes(contentResult, imgResult);
-        if (CheckDataUtils.review.equals(twoTypes.getSuggestion())) {
-            //组装要保存的信息
-            SaveCheckRecordsDTO record = CheckDataUtils.getPackageRecords(userId,
-                    userName, CheckDataUtils.cate_two, null,ModuleName.HELP_ACTIVITY.getCode(), textList,
-                    imgList, entity.getId(),null,null, twoTypes,dto.getTel(),"0");
+        if (contentResult != null && imgResult != null) {
+            CheckResultMessageDTO twoTypes = CheckDataUtils.checkTwoTypes(contentResult, imgResult);
+            if (CheckDataUtils.review.equals(twoTypes.getSuggestion())) {
+                //组装要保存的信息
+                SaveCheckRecordsDTO record = CheckDataUtils.getPackageRecords(userId,
+                        userName, CheckDataUtils.cate_two, null,ModuleName.HELP_ACTIVITY.getCode(), textList,
+                        imgList, entity.getId(),null,null, twoTypes,dto.getTel(),"0");
                 contentSecurityFeign.insertRecords(record);
+            }
         }
         return new Result().error();
     }
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 85b6eebc7..21644cdc3 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
@@ -368,13 +368,15 @@ public class ActUserClockLogServiceImpl extends BaseServiceImpl<ActUserClockLogD
             contentSecurityFeign.insertRecords(record);
         }
         //保存待审核记录
-        CheckResultMessageDTO twoTypes = CheckDataUtils.checkTwoTypes(contentResult, imgResult);
-        if (CheckDataUtils.review.equals(twoTypes.getSuggestion())) {
-            //组装要保存的信息
-            SaveCheckRecordsDTO record = CheckDataUtils.getPackageRecords(appActUserClockLogDTO.getUserId(),
-                    userName, CheckDataUtils.cate_two, null,ModuleName.HELP_SIGNIN.getCode(), textList,
-                    appActUserClockLogDTO.getImages(), entity.getId(),null,null, twoTypes,mobile,"0");
+        if (contentResult != null && imgResult != null) {
+            CheckResultMessageDTO twoTypes = CheckDataUtils.checkTwoTypes(contentResult, imgResult);
+            if (CheckDataUtils.review.equals(twoTypes.getSuggestion())) {
+                //组装要保存的信息
+                SaveCheckRecordsDTO record = CheckDataUtils.getPackageRecords(appActUserClockLogDTO.getUserId(),
+                        userName, CheckDataUtils.cate_two, null,ModuleName.HELP_SIGNIN.getCode(), textList,
+                        appActUserClockLogDTO.getImages(), entity.getId(),null,null, twoTypes,mobile,"0");
                 contentSecurityFeign.insertRecords(record);
+            }
         }
         return new Result().ok("打卡成功");
     }