【内容审核】-【待审核添加非空判断】-（王童）-2020/07/17

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/comment/service/impl/EventCommentServiceImpl.java

@@ -283,6 +283,7 @@ public class EventCommentServiceImpl extends BaseServiceImpl<EventCommentDao, Ev
         }
 
         //判断是否为待审核
+        if (contentResult != null) {
             CheckResultMessageDTO twoTypes = CheckDataUtils.checkTwoTypes(contentResult, null);
             if (CheckDataUtils.review.equals(twoTypes.getSuggestion())) {
                 //组装要保存的信息
@@ -291,6 +292,7 @@ public class EventCommentServiceImpl extends BaseServiceImpl<EventCommentDao, Ev
                         null,commentEntity.getId(), null,null,twoTypes,mobile,"0");
                 contentSecurityFeign.insertRecords(record);
             }
+        }
         return new Result();
     }
 

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/EpdcEventsServiceImpl.java

@@ -208,14 +208,16 @@ public class EpdcEventsServiceImpl extends BaseServiceImpl<EpdcEventsDao, EpdcEv
         }
 
         //保存待审核记录
+        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");
+                        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;
     }
 

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java

@@ -354,6 +354,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
             }
 
             //判断是否为待审核
+            if(contentResult != null) {
                 CheckResultMessageDTO twoTypes = CheckDataUtils.checkTwoTypes(contentResult, null);
                 if (CheckDataUtils.review.equals(twoTypes.getSuggestion())) {
                     //组装要保存的信息
@@ -362,6 +363,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
                             null,itemEntity.getId(), null,null,twoTypes,mobile,"0");
                     contentSecurityFeign.insertRecords(record);
                 }
+            }
             return new Result();
         } else {
             return new Result().error("您无法评价");

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
         }
 
         //判断是否为待审核
+        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");
+                        null, commentEntity.getId(), null, null, twoTypes, mobile, "0");
                 contentSecurityFeign.insertRecords(record);
             }
-
+        }
         return new Result();
     }
 

esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/topic/service/impl/TopicServiceImpl.java

@@ -243,6 +243,7 @@ public class TopicServiceImpl extends BaseServiceImpl<TopicDao, TopicEntity> imp
                 contentSecurityFeign.insertRecords(record);
             }
             //保存待审核记录
+            if (contentResult != null && imgResult != null) {
                 CheckResultMessageDTO twoTypes = CheckDataUtils.checkTwoTypes(contentResult, imgResult);
                 if (CheckDataUtils.review.equals(twoTypes.getSuggestion())) {
                     //组装要保存的信息
@@ -251,6 +252,7 @@ public class TopicServiceImpl extends BaseServiceImpl<TopicDao, TopicEntity> imp
                             formDto.getImages(), entity.getId(),null,null, twoTypes,formDto.getMobile(),"0");
                     contentSecurityFeign.insertRecords(record);
                 }
+            }
 
             return new Result();
         }

esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActInfoServiceImpl.java

@@ -186,6 +186,7 @@ public class ActInfoServiceImpl extends BaseServiceImpl<ActInfoDao, ActInfoEntit
         }
 
         //保存待审核记录
+        if (contentResult != null && imgResult != null) {
             CheckResultMessageDTO twoTypes = CheckDataUtils.checkTwoTypes(contentResult, imgResult);
             if (CheckDataUtils.review.equals(twoTypes.getSuggestion())) {
                 //组装要保存的信息
@@ -194,6 +195,7 @@ public class ActInfoServiceImpl extends BaseServiceImpl<ActInfoDao, ActInfoEntit
                         imgList, entity.getId(),null,null, twoTypes,dto.getTel(),"0");
                 contentSecurityFeign.insertRecords(record);
             }
+        }
         return new Result().error();
     }
 

esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActUserClockLogServiceImpl.java

@@ -368,6 +368,7 @@ public class ActUserClockLogServiceImpl extends BaseServiceImpl<ActUserClockLogD
             contentSecurityFeign.insertRecords(record);
         }
         //保存待审核记录
+        if (contentResult != null && imgResult != null) {
             CheckResultMessageDTO twoTypes = CheckDataUtils.checkTwoTypes(contentResult, imgResult);
             if (CheckDataUtils.review.equals(twoTypes.getSuggestion())) {
                 //组装要保存的信息
@@ -376,6 +377,7 @@ public class ActUserClockLogServiceImpl extends BaseServiceImpl<ActUserClockLogD
                         appActUserClockLogDTO.getImages(), entity.getId(),null,null, twoTypes,mobile,"0");
                 contentSecurityFeign.insertRecords(record);
             }
+        }
         return new Result().ok("打卡成功");
     }