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 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 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