diff --git a/src/main/java/com/budwk/app/zhgh/activity/culture/controller/ActivityCultureApplyUserController.java b/src/main/java/com/budwk/app/zhgh/activity/culture/controller/ActivityCultureApplyUserController.java index abdd680e..c80cb5f0 100644 --- a/src/main/java/com/budwk/app/zhgh/activity/culture/controller/ActivityCultureApplyUserController.java +++ b/src/main/java/com/budwk/app/zhgh/activity/culture/controller/ActivityCultureApplyUserController.java @@ -12,6 +12,7 @@ import com.budwk.app.base.param.PageForm; import com.budwk.app.base.result.Result; import com.budwk.app.web.commons.auth.utils.SecurityUtil; import com.budwk.app.zhgh.activity.basic.models.ActivityUserScope; +import com.budwk.app.zhgh.activity.basic.service.ActivityBasicScopeService; import com.budwk.app.zhgh.activity.culture.models.ActivityTissue; import com.budwk.app.zhgh.activity.culture.models.ActivityTissuePerson; import com.budwk.app.zhgh.activity.culture.service.ActivityCultureApplyUserService; @@ -49,6 +50,8 @@ public class ActivityCultureApplyUserController { private Dao dao; @Inject private ActivityCultureApplyUserService activityCultureApplyUserService; + @Inject + private ActivityBasicScopeService activityBasicScopeService; @At("/school") @Ok("beetl:platform/zhgh/activity/culture/school/applyUser/index.html") @@ -86,11 +89,10 @@ public class ActivityCultureApplyUserController { @ApiOperation(value = "报名") public Result signUp(@Valid String activityId, @Param("teamUserIds") String[] teamUserIds, @Param("ext") String formData, boolean isAgain) { ActivityTissue tissue = dao.fetch(ActivityTissue.class, activityId); - int count = dao.count(ActivityUserScope.class, - Cnd.where(ActivityUserScope::getUserId, "=", SecurityUtil.getUserId()) - .and(ActivityUserScope::getGroupId, "=", tissue.getGroupId())); - if (count == 0) { - return Result.error("您没有权限报名!"); + if (tissue.getGroupId() != null) { + if (!activityBasicScopeService.isUserInGroup(tissue.getGroupId(), SecurityUtil.getUserId())) { + return Result.error("您没有权限报名!"); + } } JSONObject dynamicFormParam = null; if (StrUtil.isNotBlank(formData)) { diff --git a/src/main/java/com/budwk/app/zhgh/activity/sports/service/impl/ActivitySportsApplyUserServiceImpl.java b/src/main/java/com/budwk/app/zhgh/activity/sports/service/impl/ActivitySportsApplyUserServiceImpl.java index d1124bdb..2fa76b3e 100644 --- a/src/main/java/com/budwk/app/zhgh/activity/sports/service/impl/ActivitySportsApplyUserServiceImpl.java +++ b/src/main/java/com/budwk/app/zhgh/activity/sports/service/impl/ActivitySportsApplyUserServiceImpl.java @@ -117,7 +117,10 @@ public class ActivitySportsApplyUserServiceImpl extends BaseServiceImpl list = listMap(sql); if (!AuthUtil.hasRoleOr(RoleConstant.SYSADMIN.name(), RoleConstant.BRANCH_UNION_CHAIRMAN.name())) { - list = list.stream().filter(item -> activityBasicScopeService.isUserInGroup(item.getInt("activityGroupId"), SecurityUtil.getUserId())).toList(); + list = list.stream().filter(item -> { + Integer groupId = item.getInt("activityGroupId"); + return groupId == null || activityBasicScopeService.isUserInGroup(groupId, SecurityUtil.getUserId()); + }).toList(); } int total = list.size(); int start = Math.max((pageParam.getPageNumber() - 1) * pageParam.getPageSize(), 0); @@ -189,7 +192,10 @@ public class ActivitySportsApplyUserServiceImpl extends BaseServiceImpl list = listMap(sql); if (!AuthUtil.hasRoleOr(RoleConstant.SYSADMIN.name(), RoleConstant.BRANCH_UNION_CHAIRMAN.name())) { - list = list.stream().filter(item -> activityBasicScopeService.isUserInGroup(item.getInt("activityGroupId"), SecurityUtil.getUserId())).toList(); + list = list.stream().filter(item -> { + Integer groupId = item.getInt("activityGroupId"); + return groupId == null || activityBasicScopeService.isUserInGroup(groupId, SecurityUtil.getUserId()); + }).toList(); } return new Pagination<>(1, 50, list.size(), list.size() > 50 ? list.subList(0, 50) : list); } @@ -299,12 +305,14 @@ public class ActivitySportsApplyUserServiceImpl extends BaseServiceImpl", applyUserPageParam.getStartAgeDate()); cnd.and("u.birthday", "<=", applyUserPageParam.getEndAgeDate()); diff --git a/src/main/resources/static/components/module/activity/UserScope.vue b/src/main/resources/static/components/module/activity/UserScope.vue index 74bf8d55..082a6621 100644 --- a/src/main/resources/static/components/module/activity/UserScope.vue +++ b/src/main/resources/static/components/module/activity/UserScope.vue @@ -423,8 +423,8 @@ module.exports = { } ], sexTypeOptions: [ - {code: "男性", name: "男性"}, - {code: "女性", name: "女性"} + {code: "男", name: "男"}, + {code: "女", name: "女"} ], pageForm: { age: [0, 0],