server_commit
This commit is contained in:
+2
-2
@@ -190,7 +190,7 @@ public class ActivityApplyController {
|
|||||||
// cnd.and(new Static("now() > school.applyEndTime"));
|
// cnd.and(new Static("now() > school.applyEndTime"));
|
||||||
// }
|
// }
|
||||||
|
|
||||||
if (!ShiroUtil.hasAnyRoles("H04,sysadmin,SCHOOL_UNION_SPORTS_ADMIN,gh08")) {
|
if (!ShiroUtil.hasAnyRoles("H04,sysadmin,SCHOOL_UNION_SPORTS_ADMIN,gh08,gh01")) {
|
||||||
cnd.and(new Static("JSON_CONTAINS(school.applyWay,JSON_ARRAY( 1))>0"));
|
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())));
|
cnd.and(new Static("(SELECT COUNT(1) FROM activity_user_scope WHERE groupId=school.activityGroupId AND userId='%s') >0".formatted(ShiroUtil.getUserId())));
|
||||||
}
|
}
|
||||||
@@ -693,7 +693,7 @@ public class ActivityApplyController {
|
|||||||
""").setParam("unionId", getUnionId()).setParam("userId", ShiroUtil.getUserId());
|
""").setParam("unionId", getUnionId()).setParam("userId", ShiroUtil.getUserId());
|
||||||
|
|
||||||
|
|
||||||
if (!ShiroUtil.hasAnyRoles("H04,sysadmin,SCHOOL_UNION_SPORTS_ADMIN,gh08")) {
|
if (!ShiroUtil.hasAnyRoles("H04,sysadmin,SCHOOL_UNION_SPORTS_ADMIN,gh08,gh01")) {
|
||||||
cnd.where().andLike("school.applyWay ", "1");
|
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())));
|
cnd.and(new Static("(SELECT COUNT(1) FROM activity_user_scope WHERE groupId=school.activityGroupId AND userId='%s') >0".formatted(ShiroUtil.getUserId())));
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user