From 531afa72d12557a9bd89ca73cc57ddb2cde9de3b Mon Sep 17 00:00:00 2001 From: "@jyuhsin" <729757837@qq.com> Date: Fri, 27 Mar 2026 15:09:16 +0800 Subject: [PATCH] commit --- .../ActivityBasicScopeController.java | 2 +- ...ActivityCultureApplyActivityController.java | 18 +++++++++--------- .../ActivityCultureApplyUserController.java | 8 ++++---- ...ActivityCultureAuditActivityController.java | 8 ++++---- .../ActivityCultureInfoManageController.java | 10 +++++----- ...ctivityCultureUserStatisticsController.java | 12 ++++++------ .../culture/models/ActivityTissue.java | 2 +- 7 files changed, 30 insertions(+), 30 deletions(-) diff --git a/src/main/java/com/budwk/app/zhgh/activity/basic/controller/ActivityBasicScopeController.java b/src/main/java/com/budwk/app/zhgh/activity/basic/controller/ActivityBasicScopeController.java index 1d78f37..fb7959c 100644 --- a/src/main/java/com/budwk/app/zhgh/activity/basic/controller/ActivityBasicScopeController.java +++ b/src/main/java/com/budwk/app/zhgh/activity/basic/controller/ActivityBasicScopeController.java @@ -243,7 +243,7 @@ public class ActivityBasicScopeController { public Result getRolesAndUnion() { return Result.success(new NutMap() {{ addv("is_A06", StpUtil.hasRole(RoleConstant.SCHOOL_UNION_ADMIN.name())); - addv("is_H04", StpUtil.hasRole(RoleConstant.BRANCH_UNION_CHAIRMAN.name())); + addv("is_H04", AuthUtil.hasRoleOr(RoleConstant.BRANCH_UNION_CHAIRMAN.name(), RoleConstant.BRANCH_UNION_ADMIN.name(), RoleConstant.BRANCH_UNION_WENTI_SPORTS.name(), RoleConstant.BRANCH_UNION_XJSHAN_PROMOTION.name(), RoleConstant.BRANCH_UNION_WENTI_WY.name())); addv("is_sysadmin", StpUtil.hasRole(RoleConstant.SYSADMIN.name())); addv("unionid", SecurityUtil.getUnionId()); }}); diff --git a/src/main/java/com/budwk/app/zhgh/activity/culture/controller/ActivityCultureApplyActivityController.java b/src/main/java/com/budwk/app/zhgh/activity/culture/controller/ActivityCultureApplyActivityController.java index b063de7..818d52f 100644 --- a/src/main/java/com/budwk/app/zhgh/activity/culture/controller/ActivityCultureApplyActivityController.java +++ b/src/main/java/com/budwk/app/zhgh/activity/culture/controller/ActivityCultureApplyActivityController.java @@ -72,9 +72,9 @@ public class ActivityCultureApplyActivityController { public void schoolIndex() { } - @At("/union") + @At("/branch") @Ok("beetl:platform/zhgh/activity/culture/union/applyActivity/index.html") - @SaCheckPermission("activity.culture.applyActivity.union") + @SaCheckPermission("activity.culture.applyActivity.branch") public void unionIndex() { } @@ -92,7 +92,7 @@ public class ActivityCultureApplyActivityController { * @description 根据活动组别查询每个工会可以报名的人数 */ @At - @SaCheckPermission(value = {"activity.culture.applyActivity.school", "activity.culture.applyActivity.union", "activity.culture.applyActivity.club"}, mode = SaMode.OR) + @SaCheckPermission(value = {"activity.culture.applyActivity.school", "activity.culture.applyActivity.branch", "activity.culture.applyActivity.club"}, mode = SaMode.OR) public Result getUnionData(String activityScopeGroupId) { List unionData = activityCultureService.getUnionData(activityScopeGroupId); return Result.success(unionData); @@ -102,7 +102,7 @@ public class ActivityCultureApplyActivityController { @At @ApiOperation("保存活动申报") @SLog(tag = "文化活动-活动申报", msg = "保存了一条文化活动记录") - @SaCheckPermission(value = {"activity.culture.applyActivity.school", "activity.culture.applyActivity.union", "activity.culture.applyActivity.club"}, mode = SaMode.OR) + @SaCheckPermission(value = {"activity.culture.applyActivity.school", "activity.culture.applyActivity.branch", "activity.culture.applyActivity.club"}, mode = SaMode.OR) public Result save(@Param("data") ActivityTissue tissue) { if (tissue.getActivity_type() == 40002) { @@ -126,7 +126,7 @@ public class ActivityCultureApplyActivityController { @SaCheckLogin @ApiOperation("提交申请") @Aop(TransAop.READ_COMMITTED) - @SaCheckPermission(value = {"activity.culture.applyActivity.school", "activity.culture.applyActivity.union", "activity.culture.applyActivity.club"}, mode = SaMode.OR) + @SaCheckPermission(value = {"activity.culture.applyActivity.school", "activity.culture.applyActivity.branch", "activity.culture.applyActivity.club"}, mode = SaMode.OR) public Result submit(@Param("data") ActivityTissue tissue) { if (tissue.getActivity_type() == 40002) { tissue.setUnionId(SecurityUtil.getUnionId()); @@ -161,7 +161,7 @@ public class ActivityCultureApplyActivityController { @SaCheckLogin @ApiOperation("重新提交申请") @Aop(TransAop.READ_COMMITTED) - @SaCheckPermission(value = {"activity.culture.applyActivity.school", "activity.culture.applyActivity.union", "activity.culture.applyActivity.club"}, mode = SaMode.OR) + @SaCheckPermission(value = {"activity.culture.applyActivity.school", "activity.culture.applyActivity.branch", "activity.culture.applyActivity.club"}, mode = SaMode.OR) public Result submitAgain(@Param("data") ActivityTissue tissue, @Param("taskId") Long taskId) { if (tissue.getActivity_type() == 40002) { tissue.setUnionId(SecurityUtil.getUnionId()); @@ -180,7 +180,7 @@ public class ActivityCultureApplyActivityController { @At @SLog(tag = "文化活动", msg = "编辑了一条文化活动记录", param = true, result = true) - @SaCheckPermission(value = {"activity.culture.applyActivity.school", "activity.culture.applyActivity.union", "activity.culture.applyActivity.club"}, mode = SaMode.OR) + @SaCheckPermission(value = {"activity.culture.applyActivity.school", "activity.culture.applyActivity.branch", "activity.culture.applyActivity.club"}, mode = SaMode.OR) public Result doEdit(@Param("tissue") @Valid ActivityTissue tissue) { activityCultureService.doEditActivity(tissue); @@ -188,7 +188,7 @@ public class ActivityCultureApplyActivityController { } @At - @SaCheckPermission(value = {"activity.culture.applyActivity.school", "activity.culture.applyActivity.union", "activity.culture.applyActivity.club"}, mode = SaMode.OR) + @SaCheckPermission(value = {"activity.culture.applyActivity.school", "activity.culture.applyActivity.branch", "activity.culture.applyActivity.club"}, mode = SaMode.OR) public Result findUser(String serachWord, Integer activity_type) { Cnd cnd = Cnd.NEW(); @@ -224,7 +224,7 @@ public class ActivityCultureApplyActivityController { } @At - @SaCheckPermission(value = {"activity.culture.applyActivity.school", "activity.culture.applyActivity.union", "activity.culture.applyActivity.club"}, mode = SaMode.OR) + @SaCheckPermission(value = {"activity.culture.applyActivity.school", "activity.culture.applyActivity.branch", "activity.culture.applyActivity.club"}, mode = SaMode.OR) public Result queryUserByIds(String[] ids) { Sql sql = Sqls.create("select id,loginname,username,unitname,unionname,sex from vw_user where id in (@id)"); sql.setParam("id", ids); 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 abdd680..68c1e7e 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 @@ -56,9 +56,9 @@ public class ActivityCultureApplyUserController { public void schoolIndex() { } - @At("/union") + @At("/branch") @Ok("beetl:platform/zhgh/activity/culture/union/applyUser/index.html") - @SaCheckPermission("activity.culture.applyUser.union") + @SaCheckPermission("activity.culture.applyUser.branch") public void unionIndex() { } @@ -70,7 +70,7 @@ public class ActivityCultureApplyUserController { @At - @SaCheckPermission(value = {"activity.culture.applyUser.school", "activity.culture.applyUser.union", "activity.culture.applyUser.club"}, mode = SaMode.OR) + @SaCheckPermission(value = {"activity.culture.applyUser.school", "activity.culture.applyUser.branch", "activity.culture.applyUser.club"}, mode = SaMode.OR) public Result pageData(PageForm page, @Valid String year, String name, @@ -111,7 +111,7 @@ public class ActivityCultureApplyUserController { @At @SLog(tag = "文化活动", msg = "取消报名") - @SaCheckPermission(value = {"activity.culture.applyUser.school", "activity.culture.applyUser.union", "activity.culture.applyUser.club"}, mode = SaMode.OR) + @SaCheckPermission(value = {"activity.culture.applyUser.school", "activity.culture.applyUser.branch", "activity.culture.applyUser.club"}, mode = SaMode.OR) public Result cancelSignUp(@Valid String activityId) { activityCultureApplyUserService.cancelSignUp(activityId); return Result.success().addMsg("取消成功！"); diff --git a/src/main/java/com/budwk/app/zhgh/activity/culture/controller/ActivityCultureAuditActivityController.java b/src/main/java/com/budwk/app/zhgh/activity/culture/controller/ActivityCultureAuditActivityController.java index c1b5d1a..2347ce1 100644 --- a/src/main/java/com/budwk/app/zhgh/activity/culture/controller/ActivityCultureAuditActivityController.java +++ b/src/main/java/com/budwk/app/zhgh/activity/culture/controller/ActivityCultureAuditActivityController.java @@ -40,9 +40,9 @@ import java.util.List; public class ActivityCultureAuditActivityController { - @At("/union") + @At("/branch") @Ok("beetl:platform/zhgh/activity/culture/union/auditActivity/index.html") - @SaCheckPermission("activity.culture.auditActivity.union") + @SaCheckPermission("activity.culture.auditActivity.branch") public void unionIndex() { } @@ -60,7 +60,7 @@ public class ActivityCultureAuditActivityController { @At - @SaCheckPermission(value = {"activity.culture.auditActivity.union", "activity.culture.auditActivity.club"}, mode = SaMode.OR) + @SaCheckPermission(value = {"activity.culture.auditActivity.branch", "activity.culture.auditActivity.club"}, mode = SaMode.OR) public Result pageData(PageForm page, boolean approval, String year, String name, @@ -137,7 +137,7 @@ public class ActivityCultureAuditActivityController { @At @SLog(tag = "文化活动", msg = "校工会审核了一条记录") @Aop(TransAop.READ_COMMITTED) - @SaCheckPermission(value = {"activity.culture.auditActivity.union", "activity.culture.auditActivity.club"}, mode = SaMode.OR) + @SaCheckPermission(value = {"activity.culture.auditActivity.branch", "activity.culture.auditActivity.club"}, mode = SaMode.OR) public Result doReview(@Param("data") String param, String id) { Dict args = Json.fromJson(Dict.class, param); ActivityTissue tissue = activityCultureService.dao().fetch(ActivityTissue.class, id); diff --git a/src/main/java/com/budwk/app/zhgh/activity/culture/controller/ActivityCultureInfoManageController.java b/src/main/java/com/budwk/app/zhgh/activity/culture/controller/ActivityCultureInfoManageController.java index 488945d..44cbc8f 100644 --- a/src/main/java/com/budwk/app/zhgh/activity/culture/controller/ActivityCultureInfoManageController.java +++ b/src/main/java/com/budwk/app/zhgh/activity/culture/controller/ActivityCultureInfoManageController.java @@ -50,9 +50,9 @@ public class ActivityCultureInfoManageController { public void schoolIndex() { } - @At("/union") + @At("/branch") @Ok("beetl:platform/zhgh/activity/culture/union/infoManage/index.html") - @SaCheckPermission("activity.culture.infoManage.union") + @SaCheckPermission("activity.culture.infoManage.branch") public void unionIndex() { } @@ -63,7 +63,7 @@ public class ActivityCultureInfoManageController { } @At - @SaCheckPermission(value = {"activity.culture.infoManage.school", "activity.culture.infoManage.union", "activity.culture.infoManage.club"}, mode = SaMode.OR) + @SaCheckPermission(value = {"activity.culture.infoManage.school", "activity.culture.infoManage.branch", "activity.culture.infoManage.club"}, mode = SaMode.OR) public Result pageData(PageForm page, String year, String name, String unionId, @@ -72,7 +72,7 @@ public class ActivityCultureInfoManageController { } @At - @SaCheckPermission(value = {"activity.culture.infoManage.school", "activity.culture.infoManage.union", "activity.culture.infoManage.club"}, mode = SaMode.OR) + @SaCheckPermission(value = {"activity.culture.infoManage.school", "activity.culture.infoManage.branch", "activity.culture.infoManage.club"}, mode = SaMode.OR) public Result activityStatusChange(@Valid String id, @Valid Boolean isUnseal) { activityCultureService.update(Chain.make("isUnseal", isUnseal), Cnd.where("id", "=", id)); activityCultureService.dao().update(Sys_home_activity.class, @@ -84,7 +84,7 @@ public class ActivityCultureInfoManageController { @At @Aop(TransAop.READ_COMMITTED) @SLog(tag = "文化活动", msg = "删除了一条活动") - @SaCheckPermission(value = {"activity.culture.infoManage.school", "activity.culture.infoManage.union", "activity.culture.infoManage.club"}, mode = SaMode.OR) + @SaCheckPermission(value = {"activity.culture.infoManage.school", "activity.culture.infoManage.branch", "activity.culture.infoManage.club"}, mode = SaMode.OR) public Result doDelete(@Valid String id) { activityCultureService.delete(id); activityCultureService.dao().clear(ActivityTissuePerson.class, Cnd.where(ActivityTissuePerson::getTissueId, "=", id)); diff --git a/src/main/java/com/budwk/app/zhgh/activity/culture/controller/ActivityCultureUserStatisticsController.java b/src/main/java/com/budwk/app/zhgh/activity/culture/controller/ActivityCultureUserStatisticsController.java index 79cb27d..a03772f 100644 --- a/src/main/java/com/budwk/app/zhgh/activity/culture/controller/ActivityCultureUserStatisticsController.java +++ b/src/main/java/com/budwk/app/zhgh/activity/culture/controller/ActivityCultureUserStatisticsController.java @@ -69,9 +69,9 @@ public class ActivityCultureUserStatisticsController { public void schoolIndex() { } - @At("/union") + @At("/branch") @Ok("beetl:platform/zhgh/activity/culture/union/userStatistics/index.html") - @SaCheckPermission("activity.culture.userStatistics.union") + @SaCheckPermission("activity.culture.userStatistics.branch") public void unionIndex() { } @@ -82,7 +82,7 @@ public class ActivityCultureUserStatisticsController { } @At - @SaCheckPermission(value = {"activity.culture.userStatistics.school", "activity.culture.userStatistics.union", "activity.culture.userStatistics.club"}, mode = SaMode.OR) + @SaCheckPermission(value = {"activity.culture.userStatistics.school", "activity.culture.userStatistics.branch", "activity.culture.userStatistics.club"}, mode = SaMode.OR) public Result pageData(@Valid PageForm page, @Valid Integer activity_type, @Valid String activityId, @@ -133,7 +133,7 @@ public class ActivityCultureUserStatisticsController { } @At - @SaCheckPermission(value = {"activity.culture.userStatistics.school", "activity.culture.userStatistics.union", "activity.culture.userStatistics.club"}, mode = SaMode.OR) + @SaCheckPermission(value = {"activity.culture.userStatistics.school", "activity.culture.userStatistics.branch", "activity.culture.userStatistics.club"}, mode = SaMode.OR) public Result getActivityByYearOrType(Integer year, @Valid Integer activity_type) { Sql sql = Sqls.create(""" @@ -175,7 +175,7 @@ public class ActivityCultureUserStatisticsController { @At - @SaCheckPermission(value = {"activity.culture.userStatistics.school", "activity.culture.userStatistics.union", "activity.culture.userStatistics.club"}, mode = SaMode.OR) + @SaCheckPermission(value = {"activity.culture.userStatistics.school", "activity.culture.userStatistics.branch", "activity.culture.userStatistics.club"}, mode = SaMode.OR) @Ok("void") @ApiOperation("导出报名人员") public void doExportUser(String id, String unionId, HttpServletResponse response) { @@ -249,7 +249,7 @@ public class ActivityCultureUserStatisticsController { } @At - @SaCheckPermission(value = {"activity.culture.userStatistics.school", "activity.culture.userStatistics.union", "activity.culture.userStatistics.club"}, mode = SaMode.OR) + @SaCheckPermission(value = {"activity.culture.userStatistics.school", "activity.culture.userStatistics.branch", "activity.culture.userStatistics.club"}, mode = SaMode.OR) @Ok("json:full") @ApiOperation("动态表单字段") public Result dynamicTableColumns(@Valid String activityId) { diff --git a/src/main/java/com/budwk/app/zhgh/activity/culture/models/ActivityTissue.java b/src/main/java/com/budwk/app/zhgh/activity/culture/models/ActivityTissue.java index 670ffae..750b177 100644 --- a/src/main/java/com/budwk/app/zhgh/activity/culture/models/ActivityTissue.java +++ b/src/main/java/com/budwk/app/zhgh/activity/culture/models/ActivityTissue.java @@ -278,7 +278,7 @@ public class ActivityTissue extends BaseModel implements Serializable, SysHomeCo if (this.getActivity_type()==40001){ sysHomeActivity.setUrl("/platform/activity/culture/applyUser/school"); }else if (this.getActivity_type()==40002){ - sysHomeActivity.setUrl("/platform/activity/culture/applyUser/union"); + sysHomeActivity.setUrl("/platform/activity/culture/applyUser/branch"); }else{ sysHomeActivity.setUrl("/platform/activity/culture/applyUser/club"); }