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 cf5c89f02..6d480bb39 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 @@ -169,11 +169,16 @@ public class EventCommentServiceImpl extends BaseServiceImpl implem SaveCheckRecordsDTO record = CheckDataUtils.getPackageRecords(evaluationFormDTO.getUserId(), userName,CheckDataUtils.cate_two , CheckDataUtils.decision_one, ModuleName.ITEM_SATISFACTION.getCode(), textList,null, null,contentResult, - null,null,mobile); - contentSecurityFeign.insertViolationsRecord(record); + null,null,mobile,"0"); + contentSecurityFeign.insertViolationsRecord(record); return new Result().error(CheckDataUtils.violations_message); - } else { - logger.error("未进入违规信息记录:" + contentResult); + } + //接口异常,保存至待审核信息 + if(contentResult == null) { + SaveCheckRecordsDTO record = CheckDataUtils.getPackageRecords(evaluationFormDTO.getUserId(), + userName, CheckDataUtils.cate_two, null,ModuleName.ITEM_SATISFACTION.getCode(), textList, + null, null,null,null, null,mobile,"1"); + contentSecurityFeign.insertRecords(record); } ItemEntity itemEntity = new ItemEntity(); @@ -354,7 +359,7 @@ public class ItemServiceImpl extends BaseServiceImpl implem //组装要保存的信息 SaveCheckRecordsDTO record = CheckDataUtils.getPackageRecords(evaluationFormDTO.getUserId(), userName, CheckDataUtils.cate_two, null, ModuleName.ITEM_SATISFACTION.getCode(), textList, - null,itemEntity.getId(), null,null,twoTypes,mobile); + null,itemEntity.getId(), null,null,twoTypes,mobile,"0"); contentSecurityFeign.insertRecords(record); } }//如果是审核状态是pass,不作任何处理 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 96d740db5..c223b4dd8 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 @@ -150,11 +150,16 @@ public class TopicCommentServiceImpl extends BaseServiceImpl imp //组装要保存的信息 SaveCheckRecordsDTO record = CheckDataUtils.getPackageRecords(formDto.getUserId(), formDto.getNickname(), CheckDataUtils.cate_two, CheckDataUtils.decision_one, ModuleName.GROUP_TOPIC.getCode(), textList, - formDto.getImages(), null,contentResult, imgResult,null,formDto.getMobile()); + formDto.getImages(), null,contentResult, imgResult,null,formDto.getMobile(),"0"); contentSecurityFeign.insertViolationsRecord(record); return new Result().error(CheckDataUtils.violations_message); - } else { - logger.info("未进入违规信息记录contentResult:" + contentResult + "---imgResult:" + imgResult); + } + //接口异常,保存至待审核信息 + if(contentResult == null || imgResult == null) { + SaveCheckRecordsDTO record = CheckDataUtils.getPackageRecords(formDto.getUserId(), + formDto.getNickname(), CheckDataUtils.cate_two, null,ModuleName.GROUP_TOPIC.getCode(), textList, + formDto.getImages(), null,null,null, null,formDto.getMobile(),"1"); + contentSecurityFeign.insertRecords(record); } TopicEntity entity = ConvertUtils.sourceToTarget(formDto, TopicEntity.class); @@ -243,7 +248,7 @@ public class TopicServiceImpl extends BaseServiceImpl imp //组装要保存的信息 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()); + formDto.getImages(), entity.getId(),null,null, twoTypes,formDto.getMobile(),"0"); contentSecurityFeign.insertRecords(record); } } 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 dabcb17f7..beb58ed87 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 @@ -161,11 +161,16 @@ public class ActInfoServiceImpl extends BaseServiceImpl statusList = new ArrayList<>(); @@ -368,8 +373,8 @@ public class ActUserClockLogServiceImpl extends BaseServiceImpl