Merge remote-tracking branch 'origin/feature/contentSecurityDev'

esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/src/main/java/com/elink/esua/epdc/entity/CheckRecordsEntity.java

@@ -48,6 +48,11 @@ public class CheckRecordsEntity extends BaseEpdcEntity {
      */
 	private String name;
 
+	/**
+	 * 用户名称
+	 */
+	private String system;
+
 	/**
 	 * 手机号
 	 */

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

@@ -166,17 +166,12 @@ public class ActInfoServiceImpl extends BaseServiceImpl<ActInfoDao, ActInfoEntit
             return new Result().error(CheckDataUtils.violations_message);
         }
 
-
         ActInfoEntity entity = ConvertUtils.sourceToTarget(dto, ActInfoEntity.class);
         if (insert(entity)) {
             if (NumConstant.ONE_STR.equals(dto.getIsBanner())) {
                 // 保存到banner
                 this.saveActInfoToBanner(entity.getId(), dto);
             }
-            // 创建定时任务（活动开始后将未审核的报名人员自动置为审核通过或不通过）
-            return this.saveActToScheduleJob(entity.getId(), dto.getActStartTime());
-        }
-
             //接口异常，保存至待审核信息
             if(contentResult == null || imgResult == null) {
                 SaveCheckRecordsDTO record = CheckDataUtils.getPackageRecords(userId,
@@ -196,6 +191,9 @@ public class ActInfoServiceImpl extends BaseServiceImpl<ActInfoDao, ActInfoEntit
                     contentSecurityFeign.insertRecords(record);
                 }
             }
+            // 创建定时任务（活动开始后将未审核的报名人员自动置为审核通过或不通过）
+            return this.saveActToScheduleJob(entity.getId(), dto.getActStartTime());
+        }
         return new Result().error();
     }