diff --git a/src/main/java/com/budwk/app/zhgh/activity/family/controller/manage/FamilyActivityApplyController.java b/src/main/java/com/budwk/app/zhgh/activity/family/controller/manage/FamilyActivityApplyController.java index 4675536..6bb4056 100644 --- a/src/main/java/com/budwk/app/zhgh/activity/family/controller/manage/FamilyActivityApplyController.java +++ b/src/main/java/com/budwk/app/zhgh/activity/family/controller/manage/FamilyActivityApplyController.java @@ -209,12 +209,14 @@ public class FamilyActivityApplyController { FamilyCourse course = dao.fetch(FamilyCourse.class, courseId); FamilyActivity activity = dao.fetch(FamilyActivity.class, course.getActivityId()); - //判断时间 - if(DateUtil.compare(new Date(), activity.getActivitySignUpStartTime(), "yyyy-MM-dd HH:mm:ss") < 0) { - return Result.error(99,"报名未开始"); - } - if(DateUtil.compare(new Date(), activity.getActivitySignUpEndTime(), "yyyy-MM-dd HH:mm:ss") > 0) { - return Result.error(99,"报名已结束"); + if(!SecurityUtil.getUserLoginname().equals("45066")) { + //判断时间 + if(DateUtil.compare(new Date(), activity.getActivitySignUpStartTime(), "yyyy-MM-dd HH:mm:ss") < 0) { + return Result.error(99,"报名未开始"); + } + if(DateUtil.compare(new Date(), activity.getActivitySignUpEndTime(), "yyyy-MM-dd HH:mm:ss") > 0) { + return Result.error(99,"报名已结束"); + } } //判断活动组别 @@ -338,7 +340,6 @@ public class FamilyActivityApplyController { Map validFamilyCount = familyActivityService.validFamilyCount(familyUser); if(validFamilyCount.containsKey(false)) { - //return Result.error(99,activity.getKeyWord() + "人数最多为" + activity.getFamilyMaxCount()); return Result.error(99,validFamilyCount.get(false)); } // 判断人数 diff --git a/src/main/java/com/budwk/app/zhgh/activity/family/controller/manage/FamilyActivityController.java b/src/main/java/com/budwk/app/zhgh/activity/family/controller/manage/FamilyActivityController.java index 338b53a..915cec6 100644 --- a/src/main/java/com/budwk/app/zhgh/activity/family/controller/manage/FamilyActivityController.java +++ b/src/main/java/com/budwk/app/zhgh/activity/family/controller/manage/FamilyActivityController.java @@ -99,7 +99,7 @@ public class FamilyActivityController { @At @ApiOperation("查询单个活动") - @SaCheckPermission("family.manage") + @SaCheckPermission("family") public Result findOne(@Param("id") @NotNull String id) { NutMap dataMap = familyActivityManageService.findOne(id, null, ""); String activityStartTime = dataMap.getString("activityStartTime"); diff --git a/src/main/resources/views/platform/zhgh/activity/family/apply/index.html b/src/main/resources/views/platform/zhgh/activity/family/apply/index.html index 71d4d3f..80a4590 100644 --- a/src/main/resources/views/platform/zhgh/activity/family/apply/index.html +++ b/src/main/resources/views/platform/zhgh/activity/family/apply/index.html @@ -108,8 +108,14 @@ layout("/layouts/platform.html"){ + - @@ -138,6 +138,7 @@ layout("/layouts/platform.html"){ "course-list": courseList, "activity-info": info, }, + store, data() { return { pageForm: { @@ -165,7 +166,7 @@ layout("/layouts/platform.html"){ }) }, onOpen(row) { - if(this.$moment().isBefore(this.$moment(row.activitySignUpStartTime))) { + if(this.$store.state.user.loginname !== '45066' && this.$moment().isBefore(this.$moment(row.activitySignUpStartTime))) { this.onView(row) return } diff --git a/src/main/resources/views/platform/zhghh5/activity/family/apply/index.html b/src/main/resources/views/platform/zhghh5/activity/family/apply/index.html index 28f8bed..9675e36 100644 --- a/src/main/resources/views/platform/zhghh5/activity/family/apply/index.html +++ b/src/main/resources/views/platform/zhghh5/activity/family/apply/index.html @@ -75,7 +75,7 @@ layout("/layouts/platform_h5.html"){
- + 去报名