diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/ActPeriodService.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/ActPeriodService.java index 723b651d..0fa7f904 100644 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/ActPeriodService.java +++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/ActPeriodService.java @@ -101,7 +101,7 @@ public interface ActPeriodService extends BaseService { * @author lc * @since 2021/9/2 15:28 */ - void removeActPeriodsByActId(String actId); + boolean removeActPeriodsByActId(String actId); /** * 获取活动时间段 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 befdfa4d..cea3887d 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 @@ -923,14 +923,16 @@ public class ActInfoServiceImpl extends BaseServiceImpl periods, String actId, Integer actQuotaCategory) { // 删除活动已有的时间段 - actPeriodService.removeActPeriodsByActId(actId); - // 保存活动时间段 - for (ActPeriodDTO dto: - periods) { - dto.setActId(actId); - dto.setActPeriodQuotaCategory(actQuotaCategory); - dto.setId(null); - actPeriodService.save(dto); + boolean result = actPeriodService.removeActPeriodsByActId(actId); + if (result) { + // 保存活动时间段 + for (ActPeriodDTO dto: + periods) { + dto.setActId(actId); + dto.setActPeriodQuotaCategory(actQuotaCategory); + dto.setId(null); + actPeriodService.save(dto); + } } } } diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActPeriodServiceImpl.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActPeriodServiceImpl.java index 33f0f21f..0cdc48c3 100644 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActPeriodServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActPeriodServiceImpl.java @@ -101,13 +101,14 @@ public class ActPeriodServiceImpl extends BaseServiceImpl periods = baseDao.selectPeriodsAlreadySignIn(actId); if (CollectionUtil.isNotEmpty(periods)) { - throw new RenException("活动时间段已有人报名,不能修改"); + return false; } baseDao.modifyDelFlagByActId(actId); + return true; } @Override