Merge remote-tracking branch 'origin/dev_bugfix_ljj'

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkActServiceImpl.java

@@ -162,9 +162,9 @@ public class WorkActServiceImpl implements WorkActService {
         //校验参数
 
         //校验 活动报名截止时间应该大于当前时间
-        if (actInfoEntity.getSignUpEndTime().before(DateUtils.minStrToSecondDate(DateUtils.format(new Date(), DateUtils.DATE_TIME_PATTERN_END_WITH_MINUTE)))){
-            throw new RenException(EpmetErrorCode.ACT_SIGN_UP_END_TIME_EARLIER_NOW_EERROR.getCode(),EpmetErrorCode.ACT_SIGN_UP_END_TIME_EARLIER_NOW_EERROR.getMsg());
-        }
+        // if (actInfoEntity.getSignUpEndTime().before(DateUtils.minStrToSecondDate(DateUtils.format(new Date(), DateUtils.DATE_TIME_PATTERN_END_WITH_MINUTE)))){
+        //     throw new RenException(EpmetErrorCode.ACT_SIGN_UP_END_TIME_EARLIER_NOW_EERROR.getCode(),EpmetErrorCode.ACT_SIGN_UP_END_TIME_EARLIER_NOW_EERROR.getMsg());
+        // }
         this.checkPublishFormDTO(actInfoEntity);
         PublishActResultDTO publishActResultDTO=new PublishActResultDTO();
         //内容审核（活动标题、招募要求、活动内容图文）
@@ -202,10 +202,10 @@ public class WorkActServiceImpl implements WorkActService {
         ActInfoEntity actInfoEntity=this.constructActInfo(formDTO);
         //校验参数
 
-        //校验 活动报名截止时间应该大于当前时间
-        if (actInfoEntity.getSignUpEndTime().before(DateUtils.minStrToSecondDate(DateUtils.format(new Date(), DateUtils.DATE_TIME_PATTERN_END_WITH_MINUTE)))){
-            throw new RenException(EpmetErrorCode.ACT_SIGN_UP_END_TIME_EARLIER_NOW_EERROR.getCode(),EpmetErrorCode.ACT_SIGN_UP_END_TIME_EARLIER_NOW_EERROR.getMsg());
-        }
+        // //校验 活动报名截止时间应该大于当前时间
+        // if (actInfoEntity.getSignUpEndTime().before(DateUtils.minStrToSecondDate(DateUtils.format(new Date(), DateUtils.DATE_TIME_PATTERN_END_WITH_MINUTE)))){
+        //     throw new RenException(EpmetErrorCode.ACT_SIGN_UP_END_TIME_EARLIER_NOW_EERROR.getCode(),EpmetErrorCode.ACT_SIGN_UP_END_TIME_EARLIER_NOW_EERROR.getMsg());
+        // }
         this.checkPublishFormDTO(actInfoEntity);
         PublishActResultDTO publishActResultDTO=new PublishActResultDTO();
         //内容审核（活动标题、招募要求、活动内容图文）