diff --git a/src/main/java/com/budwk/app/zhgh/staffbenefit/benefiting/controller/BenefitingProjectManageController.java b/src/main/java/com/budwk/app/zhgh/staffbenefit/benefiting/controller/BenefitingProjectManageController.java index 41f2ebee..d25dff76 100644 --- a/src/main/java/com/budwk/app/zhgh/staffbenefit/benefiting/controller/BenefitingProjectManageController.java +++ b/src/main/java/com/budwk/app/zhgh/staffbenefit/benefiting/controller/BenefitingProjectManageController.java @@ -1,6 +1,7 @@ package com.budwk.app.zhgh.staffbenefit.benefiting.controller; import cn.dev33.satoken.annotation.SaCheckPermission; +import cn.dev33.satoken.annotation.SaMode; import com.budwk.app.base.page.Pagination; import com.budwk.app.base.param.PageForm; import com.budwk.app.base.result.Result; @@ -47,7 +48,7 @@ public class BenefitingProjectManageController { @At - @SaCheckPermission(value = {"benefiting.manage","benefiting.list"}) + @SaCheckPermission(value = {"benefiting.manage", "benefiting.list"}, mode = SaMode.OR) public Result pageData(PageForm pageForm,Integer year,String projectName) { Sql sql = Sqls.create(""" select * from benefiting_project $condition @@ -63,7 +64,7 @@ public class BenefitingProjectManageController { @At - @SaCheckPermission("benefiting.manage") + @SaCheckPermission(value = {"benefiting.manage", "benefiting.list"}, mode = SaMode.OR) public Result doSubmit(BenefitingProject benefitingProject) { benefitingProject.setCreateTime(new Date()); baseService.insertOrUpdate(benefitingProject); @@ -72,7 +73,7 @@ public class BenefitingProjectManageController { @At - @SaCheckPermission("benefiting.manage") + @SaCheckPermission(value = {"benefiting.manage", "benefiting.list"}, mode = SaMode.OR) public Result doDelete(String id) { baseService.dao().delete(BenefitingProject.class, id); return Result.success(); @@ -80,7 +81,7 @@ public class BenefitingProjectManageController { @At - @SaCheckPermission("benefiting.manage") + @SaCheckPermission(value = {"benefiting.manage", "benefiting.list"}, mode = SaMode.OR) public Result findOne(String id) { BenefitingProject project = baseService.dao().fetch(BenefitingProject.class, id); return Result.success(project); diff --git a/src/main/resources/views/platform/zhgh/activity/trainSignUp/apply/index.html b/src/main/resources/views/platform/zhgh/activity/trainSignUp/apply/index.html index a7c74d82..63a85991 100644 --- a/src/main/resources/views/platform/zhgh/activity/trainSignUp/apply/index.html +++ b/src/main/resources/views/platform/zhgh/activity/trainSignUp/apply/index.html @@ -139,11 +139,16 @@ layout("/layouts/platform.html"){ this.$refs.infoRef.initData(row.id) }) }, - onOpen(row) { + async onOpen(row) { if(this.$moment().isBefore(this.$moment(row.activitySignUpStartTime))) { this.onView(row) return } + const res = await this.$axios.post('/platform/trainSignUp/apply/validSignCount') + if (res.code !== 0) { + this.$message.warning(res.msg) + return + } this.infoVisible = false this.$nextTick(() => { this.$refs.guava.view(() => { diff --git a/src/main/resources/views/platform/zhghh5/activity/trainSignUp/common/times.js b/src/main/resources/views/platform/zhghh5/activity/trainSignUp/common/times.js index f001bf81..dd26a606 100644 --- a/src/main/resources/views/platform/zhghh5/activity/trainSignUp/common/times.js +++ b/src/main/resources/views/platform/zhghh5/activity/trainSignUp/common/times.js @@ -21,8 +21,8 @@ const times = {
$moment().unix()" @click.stop="onSign(item)" size="mini" type="info">签到 已签到