diff --git a/src/main/java/io/v/nutz/zhgh/activity/controller/basic/ActivityBasicScopeController.java b/src/main/java/io/v/nutz/zhgh/activity/controller/basic/ActivityBasicScopeController.java index 1ba9ad8..a9b2905 100644 --- a/src/main/java/io/v/nutz/zhgh/activity/controller/basic/ActivityBasicScopeController.java +++ b/src/main/java/io/v/nutz/zhgh/activity/controller/basic/ActivityBasicScopeController.java @@ -235,7 +235,7 @@ public class ActivityBasicScopeController { $condition """); Cnd cnd = Cnd.NEW(); - if (!ShiroUtil.hasAnyRoles("sysadmin,H06,H10")) { + if (!ShiroUtil.hasAnyRoles("sysadmin,H06,H10,SCHOOL_UNION_SPORTS_ADMIN")) { if (ShiroUtil.hasAnyRoles(new String[]{"H04", "club01"})) { cnd.and("creator", "=", ShiroUtil.getPrincipalProperty("id")); } @@ -284,7 +284,7 @@ public class ActivityBasicScopeController { addv("is_H04", ShiroUtil.hasRole("H04")); addv("is_H02", ShiroUtil.hasRole("club01")); addv("is_H03", ShiroUtil.hasRole("SchoolUnionMemberAdmin")); - addv("is_sysadmin", ShiroUtil.hasRole("sysadmin")); + addv("is_sysadmin", ShiroUtil.hasRole("sysadmin,SCHOOL_UNION_SPORTS_ADMIN")); addv("unionid", Vi.getUnionId()); }}; } diff --git a/src/main/java/io/v/nutz/zhgh/activity/controller/basic/ActivityBasicUserController.java b/src/main/java/io/v/nutz/zhgh/activity/controller/basic/ActivityBasicUserController.java index 3d1bb7e..b816108 100644 --- a/src/main/java/io/v/nutz/zhgh/activity/controller/basic/ActivityBasicUserController.java +++ b/src/main/java/io/v/nutz/zhgh/activity/controller/basic/ActivityBasicUserController.java @@ -97,7 +97,7 @@ public class ActivityBasicUserController { cnd.andEX("u.unitid", "=", unitId); cnd.andEX("u.personType", "=", personType); cnd.andEX("u.userState", "=", userState); - if (!ShiroUtil.hasAnyRoles("sysadmin,A06")) { + if (!ShiroUtil.hasAnyRoles("sysadmin,A06,SCHOOL_UNION_SPORTS_ADMIN")) { cnd.andEX("aus.creator", "=", ShiroUtil.getPrincipalProperty("id")); } diff --git a/src/main/java/io/v/nutz/zhgh/activity/controller/basic/ActivityUnionController.java b/src/main/java/io/v/nutz/zhgh/activity/controller/basic/ActivityUnionController.java index 24f21b7..f56f2b5 100644 --- a/src/main/java/io/v/nutz/zhgh/activity/controller/basic/ActivityUnionController.java +++ b/src/main/java/io/v/nutz/zhgh/activity/controller/basic/ActivityUnionController.java @@ -202,7 +202,7 @@ public class ActivityUnionController { if (Strings.isNotBlank(searchName) && Strings.isNotBlank(searchKeyword)) { cnd.and(searchName, "like", "%" + searchKeyword + "%"); } - if (!ShiroUtil.hasAnyRoles("sysadmin,A06")) { + if (!ShiroUtil.hasAnyRoles("sysadmin,A06,SCHOOL_UNION_SPORTS_ADMIN")) { cnd.and("gh.id", "=", basicUnit.getUnionid()); } if (Strings.isNotBlank(pageOrderName) && Strings.isNotBlank(pageOrderBy)) { @@ -233,7 +233,7 @@ public class ActivityUnionController { try { union.setSource("activity"); sysUnionService.insert(union); - if (!ShiroUtil.hasAnyRoles("sysadmin.H04")) { + if (!ShiroUtil.hasAnyRoles("sysadmin.H04,SCHOOL_UNION_SPORTS_ADMIN")) { sysUnitService.dao().update(ActivityBasicUnit.class, Chain.make("unionid", union.getId()), Cnd.where("id", "=", Vi.getUnit().getId())); } return Result.success(); diff --git a/src/main/java/io/v/nutz/zhgh/activity/controller/school/ActivityApplyController.java b/src/main/java/io/v/nutz/zhgh/activity/controller/school/ActivityApplyController.java index acf2ebf..c75e965 100644 --- a/src/main/java/io/v/nutz/zhgh/activity/controller/school/ActivityApplyController.java +++ b/src/main/java/io/v/nutz/zhgh/activity/controller/school/ActivityApplyController.java @@ -187,7 +187,7 @@ public class ActivityApplyController { // cnd.and(new Static("now() > school.applyEndTime")); // } - if (!ShiroUtil.hasAnyRoles("H04,sysadmin")) { + if (!ShiroUtil.hasAnyRoles("H04,sysadmin,SCHOOL_UNION_SPORTS_ADMIN")) { cnd.and(new Static("JSON_CONTAINS(school.applyWay,JSON_ARRAY( 1))>0")); cnd.and(new Static("(SELECT COUNT(1) FROM activity_user_scope WHERE groupId=school.activityGroupId AND userId='%s') >0".formatted(ShiroUtil.getUserId()))); } @@ -664,7 +664,7 @@ public class ActivityApplyController { """).setParam("unionId", getUnionId()).setParam("userId", ShiroUtil.getUserId()); - if (!ShiroUtil.hasAnyRoles("H04,sysadmin")) { + if (!ShiroUtil.hasAnyRoles("H04,sysadmin,SCHOOL_UNION_SPORTS_ADMIN")) { cnd.where().andLike("school.applyWay ", "1"); cnd.and(new Static("(SELECT COUNT(1) FROM activity_user_scope WHERE groupId=school.activityGroupId AND userId='%s') >0".formatted(ShiroUtil.getUserId()))); } diff --git a/src/main/java/io/v/nutz/zhgh/activity/controller/school/ActivityCommonController.java b/src/main/java/io/v/nutz/zhgh/activity/controller/school/ActivityCommonController.java index 880f105..04a0cbd 100644 --- a/src/main/java/io/v/nutz/zhgh/activity/controller/school/ActivityCommonController.java +++ b/src/main/java/io/v/nutz/zhgh/activity/controller/school/ActivityCommonController.java @@ -232,7 +232,7 @@ public class ActivityCommonController { app.sex """).setParam("id", id); - if (!ShiroUtil.hasAnyRoles("sysadmin,A06") && ShiroUtil.hasRole("H04")) { + if (!ShiroUtil.hasAnyRoles("sysadmin,A06,SCHOOL_UNION_SPORTS_ADMIN") && ShiroUtil.hasRole("H04")) { sql1.setVar("union", " AND app.unionId = '" + unionid + "' "); } @@ -245,7 +245,7 @@ public class ActivityCommonController { Cnd unionCnd = Cnd.NEW(); - if (!ShiroUtil.hasAnyRoles("sysadmin,A06") && ShiroUtil.hasRole("H04")) { + if (!ShiroUtil.hasAnyRoles("sysadmin,A06,SCHOOL_UNION_SPORTS_ADMIN") && ShiroUtil.hasRole("H04")) { unionCnd.and("id", "=", unionid); } diff --git a/src/main/java/io/v/nutz/zhgh/activity/controller/school/ActivityInfoManageController.java b/src/main/java/io/v/nutz/zhgh/activity/controller/school/ActivityInfoManageController.java index aa3fd64..56a82bb 100644 --- a/src/main/java/io/v/nutz/zhgh/activity/controller/school/ActivityInfoManageController.java +++ b/src/main/java/io/v/nutz/zhgh/activity/controller/school/ActivityInfoManageController.java @@ -117,7 +117,7 @@ public class ActivityInfoManageController { } else if ("four".equals(query)) { cnd.and(new Static("now() > school.endTime")); } - if (!ShiroUtil.hasAnyRoles("sysadmin,A06")) { + if (!ShiroUtil.hasAnyRoles("sysadmin,A06,SCHOOL_UNION_SPORTS_ADMIN")) { if (ShiroUtil.hasRole("H04")) { cnd.and("school.belongUnionId", "=", Vi.getUnionId()); } diff --git a/src/main/java/io/v/nutz/zhgh/activity/controller/school/ActivityReadingController.java b/src/main/java/io/v/nutz/zhgh/activity/controller/school/ActivityReadingController.java index bebd59b..835e774 100644 --- a/src/main/java/io/v/nutz/zhgh/activity/controller/school/ActivityReadingController.java +++ b/src/main/java/io/v/nutz/zhgh/activity/controller/school/ActivityReadingController.java @@ -88,7 +88,7 @@ public class ActivityReadingController { cnd.and("close", "!=", true); cnd.and("YEAR(startTime)", "=", year); cnd.and("activityLevel", "=", activityLevel); - if (!ShiroUtil.hasAnyRoles("sysadmin,A06")) { + if (!ShiroUtil.hasAnyRoles("sysadmin,A06,SCHOOL_UNION_SPORTS_ADMIN")) { if (activityLevel.equals("40002")) { cnd.and("belongUnionId", "=", getUnionId()); } @@ -135,7 +135,7 @@ public class ActivityReadingController { cnd.and("app.activityId", "=", id); // cnd.and("YEAR(app.applyDate)", "=", year); sql.setCondition(cnd); - if (!ShiroUtil.hasAnyRoles("sysadmin,A06")) { + if (!ShiroUtil.hasAnyRoles("sysadmin,A06,SCHOOL_UNION_SPORTS_ADMIN")) { if (ShiroUtil.hasRole("H04") && activityLevel.equals("40002")) { cnd.and("app.activityUnionId", "=", basicUnit.getUnionid()); cnd.and("school.belongUnionId", "=", basicUnit.getUnionid()); @@ -150,7 +150,7 @@ public class ActivityReadingController { List apply = new ArrayList(); Cnd unionCnd = Cnd.NEW(); - if (!ShiroUtil.hasAnyRoles("sysadmin,A06")) { + if (!ShiroUtil.hasAnyRoles("sysadmin,A06,SCHOOL_UNION_SPORTS_ADMIN")) { if (ShiroUtil.hasRole("H04")) { unionCnd.and("id", "=", basicUnit.getUnionid()); } @@ -353,7 +353,7 @@ public class ActivityReadingController { } - if (!ShiroUtil.hasAnyRoles("sysadmin,A06,H10")) { + if (!ShiroUtil.hasAnyRoles("sysadmin,A06,H10,SCHOOL_UNION_SPORTS_ADMIN")) { if (!user.getUnionid().equals(getUnionId())) { setObj(v.getLoginName() + "此用户不是本工会人员"); throw new RuntimeException(v.getLoginName() + "此用户不是本工会人员"); diff --git a/src/main/java/io/v/nutz/zhgh/activity/controller/school/ActivityRemindController.java b/src/main/java/io/v/nutz/zhgh/activity/controller/school/ActivityRemindController.java index 34fbbfb..81bb20a 100644 --- a/src/main/java/io/v/nutz/zhgh/activity/controller/school/ActivityRemindController.java +++ b/src/main/java/io/v/nutz/zhgh/activity/controller/school/ActivityRemindController.java @@ -214,7 +214,7 @@ public class ActivityRemindController { @ViReturn public Object getActivitys() { Cnd cnd = Cnd.NEW(); - if (!ShiroUtil.hasAnyRoles("sysadmin,A06")) { + if (!ShiroUtil.hasAnyRoles("sysadmin,A06,SCHOOL_UNION_SPORTS_ADMIN")) { if (ShiroUtil.hasRole("H04")) { cnd.and("belongUnionId", "=", Vi.getUnionId()); } diff --git a/src/main/java/io/v/nutz/zhgh/activity/controller/site/SiteRecordController.java b/src/main/java/io/v/nutz/zhgh/activity/controller/site/SiteRecordController.java index 780e943..966d603 100644 --- a/src/main/java/io/v/nutz/zhgh/activity/controller/site/SiteRecordController.java +++ b/src/main/java/io/v/nutz/zhgh/activity/controller/site/SiteRecordController.java @@ -79,7 +79,7 @@ public class SiteRecordController { cnd.and("asr.isRetire","=",isRetire); } - if (!ShiroUtil.hasAnyRoles("sysadmin,A06")) { + if (!ShiroUtil.hasAnyRoles("sysadmin,A06,SCHOOL_UNION_SPORTS_ADMIN")) { cnd.and("asr.reserve_person_unionid", "=", Vi.getUnionId()); } if (Strings.isNotBlank(time)) { diff --git a/src/main/java/io/v/nutz/zhgh/activity/controller/site/SiteReserveController.java b/src/main/java/io/v/nutz/zhgh/activity/controller/site/SiteReserveController.java index def68ab..daea1e3 100644 --- a/src/main/java/io/v/nutz/zhgh/activity/controller/site/SiteReserveController.java +++ b/src/main/java/io/v/nutz/zhgh/activity/controller/site/SiteReserveController.java @@ -100,7 +100,7 @@ public class SiteReserveController { if (StrUtil.isNotBlank(isRetire)) { cnd.and("asr.isRetire","=",isRetire); } - if (!ShiroUtil.hasAnyRoles("sysadmin,A06")) { + if (!ShiroUtil.hasAnyRoles("sysadmin,A06,SCHOOL_UNION_SPORTS_ADMIN")) { cnd.and("reserve_person_id", "=", ShiroUtil.getPrincipalProperty("id")); } if (Strings.isNotBlank(time)) { diff --git a/src/main/java/io/v/nutz/zhgh/activity/controller/site/SiteUnionProcessController.java b/src/main/java/io/v/nutz/zhgh/activity/controller/site/SiteUnionProcessController.java index a187602..c4ddb5e 100644 --- a/src/main/java/io/v/nutz/zhgh/activity/controller/site/SiteUnionProcessController.java +++ b/src/main/java/io/v/nutz/zhgh/activity/controller/site/SiteUnionProcessController.java @@ -84,7 +84,7 @@ public class SiteUnionProcessController { CndPlus cnd = CndPlus.create(); cnd.and("asr.reserve_state", "true".equals(isAudit) ? ">" : "false".equals(isAudit) ? "=" : ">=", 6098); cnd.and("asr.isRetire","=",0); - if (!ShiroUtil.hasAnyRoles("sysadmin,A06")) { + if (!ShiroUtil.hasAnyRoles("sysadmin,A06,SCHOOL_UNION_SPORTS_ADMIN")) { cnd.and("reserve_person_unionid", "=", Vi.getUnionId()); } if (Strings.isNotBlank(time)) { diff --git a/src/main/java/io/v/nutz/zhgh/activity/controller/union/ActivityUnionApplyUserController.java b/src/main/java/io/v/nutz/zhgh/activity/controller/union/ActivityUnionApplyUserController.java index c2bda67..bc7b811 100644 --- a/src/main/java/io/v/nutz/zhgh/activity/controller/union/ActivityUnionApplyUserController.java +++ b/src/main/java/io/v/nutz/zhgh/activity/controller/union/ActivityUnionApplyUserController.java @@ -101,7 +101,7 @@ public class ActivityUnionApplyUserController { cnd.where().andLike("tissue.name", name); } - if (!ShiroUtil.hasAnyRoles("A06,sysadmin")) { + if (!ShiroUtil.hasAnyRoles("A06,sysadmin,SCHOOL_UNION_SPORTS_ADMIN")) { cnd.and(new Static("(SELECT COUNT(1) FROM activity_user_scope WHERE groupId=tissue.groupId AND userId='%s') >0".formatted(ShiroUtil.getUserId()))); } diff --git a/src/main/java/io/v/nutz/zhgh/activity/controller/union/ActivityUnionManageController.java b/src/main/java/io/v/nutz/zhgh/activity/controller/union/ActivityUnionManageController.java index cc048b8..162aa4f 100644 --- a/src/main/java/io/v/nutz/zhgh/activity/controller/union/ActivityUnionManageController.java +++ b/src/main/java/io/v/nutz/zhgh/activity/controller/union/ActivityUnionManageController.java @@ -124,7 +124,7 @@ public class ActivityUnionManageController { Sql sql = Sqls.create(""" SELECT id userId,username userName,loginname loginName,sex,mobile,unitname unitName,unionname unionName FROM `user` $condition """); - if (!ShiroUtil.hasRole("sysadmin")) { + if (!ShiroUtil.hasAnyRoles("sysadmin,SCHOOL_UNION_SPORTS_ADMIN")) { if (activity_type == 40002) { cnd.and("unionId", "=", Vi.getUnionId()); } else if (activity_type == 40003) { @@ -158,7 +158,7 @@ public class ActivityUnionManageController { tissue.setUserId(ShiroUtil.getUserId()); } tissue.setApplyTime(DateUtil.getDate()); - if (!ShiroUtil.hasAnyRoles("sysadmin,A06")) { + if (!ShiroUtil.hasAnyRoles("sysadmin,A06,SCHOOL_UNION_SPORTS_ADMIN")) { tissue.setState(1); } else { tissue.setState(3); diff --git a/src/main/java/io/v/nutz/zhgh/activity/controller/union/ActivityUnionUserStatisticsController.java b/src/main/java/io/v/nutz/zhgh/activity/controller/union/ActivityUnionUserStatisticsController.java index 9ea113b..7e4d581 100644 --- a/src/main/java/io/v/nutz/zhgh/activity/controller/union/ActivityUnionUserStatisticsController.java +++ b/src/main/java/io/v/nutz/zhgh/activity/controller/union/ActivityUnionUserStatisticsController.java @@ -86,7 +86,7 @@ public class ActivityUnionUserStatisticsController { Cnd cnd = Cnd.NEW(); cnd.and("atp.tissueId", "=", activityId); cnd.andEX("u.unionId", "=", unionId); - if (!ShiroUtil.hasAnyRoles("sysadmin,A06")) { + if (!ShiroUtil.hasAnyRoles("sysadmin,A06,SCHOOL_UNION_SPORTS_ADMIN")) { if (!tissue.getUserId().equals(ShiroUtil.getUserId())) { if (type == 40002) { cnd.and("unionId", "=", Vi.getUnionId()); diff --git a/src/main/java/io/v/nutz/zhgh/activity/controller/union/ActivityUnionYearSummaryController.java b/src/main/java/io/v/nutz/zhgh/activity/controller/union/ActivityUnionYearSummaryController.java index 1f41090..620daf0 100644 --- a/src/main/java/io/v/nutz/zhgh/activity/controller/union/ActivityUnionYearSummaryController.java +++ b/src/main/java/io/v/nutz/zhgh/activity/controller/union/ActivityUnionYearSummaryController.java @@ -110,13 +110,13 @@ public class ActivityUnionYearSummaryController { str += " left join `user` u on su.userId = u.id"; if ("2".equals(summaryFrom)) { str += " left join sys_union un on su.tissueId = un.id"; - if (!ShiroUtil.hasAnyRoles(new String[]{"sysadmin", "A06"})) { + if (!ShiroUtil.hasAnyRoles(new String[]{"sysadmin", "A06", "SCHOOL_UNION_SPORTS_ADMIN"})) { cnd.and("su.tissueId", "=", Vi.getUnionId()); } } if ("3".equals(summaryFrom)) { str += " left join sys_club club on su.tissueId = club.id"; - if (!ShiroUtil.hasAnyRoles(new String[]{"sysadmin", "A06"})) { + if (!ShiroUtil.hasAnyRoles(new String[]{"sysadmin", "A06", "SCHOOL_UNION_SPORTS_ADMIN"})) { cnd.and("su.tissueId", "=", vi.getClubId()); } } diff --git a/src/main/java/io/v/nutz/zhgh/activity/services/impl/ActivityPlanServiceImpl.java b/src/main/java/io/v/nutz/zhgh/activity/services/impl/ActivityPlanServiceImpl.java index 16409b8..aadfe2f 100644 --- a/src/main/java/io/v/nutz/zhgh/activity/services/impl/ActivityPlanServiceImpl.java +++ b/src/main/java/io/v/nutz/zhgh/activity/services/impl/ActivityPlanServiceImpl.java @@ -53,7 +53,7 @@ public class ActivityPlanServiceImpl extends ViServiceImpl impleme cnd.where().andLike("ap.name", name); } - if (!ShiroUtil.hasAnyRoles("sysadmin,H10,A06")) { + if (!ShiroUtil.hasAnyRoles("sysadmin,H10,A06,SCHOOL_UNION_SPORTS_ADMIN")) { if (ShiroUtil.hasRole("H04")) { cnd.and("tissueId", "in", vi.getMangeUnionStr()); } else if (ShiroUtil.hasRole("club01")) { diff --git a/src/main/java/io/v/nutz/zhgh/activity/services/impl/ActivityTissueServiceImpl.java b/src/main/java/io/v/nutz/zhgh/activity/services/impl/ActivityTissueServiceImpl.java index ac3b80f..5999d11 100644 --- a/src/main/java/io/v/nutz/zhgh/activity/services/impl/ActivityTissueServiceImpl.java +++ b/src/main/java/io/v/nutz/zhgh/activity/services/impl/ActivityTissueServiceImpl.java @@ -76,7 +76,7 @@ public class ActivityTissueServiceImpl extends ViServiceImpl imp cnd.where().andLike("tissue.name", name); } - if (!ShiroUtil.hasAnyRoles("sysadmin,H10,A06")) { + if (!ShiroUtil.hasAnyRoles("sysadmin,H10,A06,SCHOOL_UNION_SPORTS_ADMIN")) { cnd.and("tissue.userId", "=", ShiroUtil.getUserId()); /* if (ShiroUtil.hasRole("H04")) { cnd.and("tissue.unionId", "in", vi.getMangeUnionStr()); diff --git a/src/main/resources/views/platform/activity/basic/ActivityUser.html b/src/main/resources/views/platform/activity/basic/ActivityUser.html index 8cf14f9..276b12e 100644 --- a/src/main/resources/views/platform/activity/basic/ActivityUser.html +++ b/src/main/resources/views/platform/activity/basic/ActivityUser.html @@ -4,7 +4,6 @@ layout("/layouts/platform.html"){
- + - + @@ -25,9 +25,7 @@ layout("/layouts/platform.html"){ } .other { - } -
@@ -39,24 +37,26 @@ layout("/layouts/platform.html"){
月份:
- + style="width: 100%" + @change="doSearch" + v-model="pageForm.time" + placeholder="请选择月份" + type="month" + value-format="yyyy-MM" + >
姓名工号:
- - + + @@ -67,11 +67,14 @@ layout("/layouts/platform.html"){
场地名称:
- - +
@@ -94,8 +97,7 @@ layout("/layouts/platform.html"){ - - + + - - + @@ -148,9 +151,7 @@ layout("/layouts/platform.html"){ - -
- - - - - - - - - + + + + + + + + + +
搜索
- - - + + - - + - - + + - - + @@ -112,23 +116,17 @@ layout("/layouts/platform.html"){ - - + + - - +