diff --git a/src/main/java/io/v/nutz/base/utils/PwdUtil.java b/src/main/java/io/v/nutz/base/utils/PwdUtil.java index 6dc3fc0..af402ac 100644 --- a/src/main/java/io/v/nutz/base/utils/PwdUtil.java +++ b/src/main/java/io/v/nutz/base/utils/PwdUtil.java @@ -126,8 +126,14 @@ public class PwdUtil { // System.out.println(dbPwd); // System.out.println(s); - String pwd = "002154"; + String pwd = "006207"; String dbPwd = PwdUtil.doSm4CbcEncrypt(pwd); System.out.println(dbPwd); + + // 7fdc9e096de7e2c18e4ed4efa16f50f8 + + // e43646c461a8ee364c569552225e28be +// String ddPwd = PwdUtil.doSm4CbcDecrypt("7fdc9e096de7e2c18e4ed4efa16f50f8"); +// System.out.println(ddPwd); } } diff --git a/src/main/java/io/v/nutz/sys/controllers/platform/sys/club/ClubUserCountController.java b/src/main/java/io/v/nutz/sys/controllers/platform/sys/club/ClubUserCountController.java index 3293415..bca904d 100644 --- a/src/main/java/io/v/nutz/sys/controllers/platform/sys/club/ClubUserCountController.java +++ b/src/main/java/io/v/nutz/sys/controllers/platform/sys/club/ClubUserCountController.java @@ -115,7 +115,7 @@ public class ClubUserCountController { .formatted(DateUtil.thisYear()))); } } - if(!ShiroUtil.hasAnyRoles("sysadmin, A06, xxhgly")) { + if(!ShiroUtil.hasAnyRoles("sysadmin, SchoolUnionAdmin, xxhgly")) { List userRoles = dao.query(Sys_user_role.class, Cnd.where("userid", "=", ShiroUtil.getPlatformUid()) .and("roleid", "=", Roles.club01)); List stid = userRoles.stream().map(Sys_user_role::getStid).collect(Collectors.toList()); @@ -193,7 +193,7 @@ public class ClubUserCountController { .formatted(DateUtil.thisYear()))); } } - if(!ShiroUtil.hasAnyRoles("sysadmin, A06, xxhgly")) { + if(!ShiroUtil.hasAnyRoles("sysadmin, SchoolUnionAdmin, xxhgly")) { List userRoles = dao.query(Sys_user_role.class, Cnd.where("userid", "=", ShiroUtil.getPlatformUid()) .and("roleid", "=", Roles.club01)); List stid = userRoles.stream().map(Sys_user_role::getStid).collect(Collectors.toList()); @@ -234,7 +234,7 @@ public class ClubUserCountController { ORDER BY FIELD( c.sf, 1, 3, 4, 5, 2 ) """); Cnd cnd = Cnd.NEW(); - if(!ShiroUtil.hasAnyRoles("sysadmin, A06, xxhgly")) { + if(!ShiroUtil.hasAnyRoles("sysadmin, SchoolUnionAdmin, xxhgly")) { List userRoles = dao.query(Sys_user_role.class, Cnd.where("userid", "=", ShiroUtil.getPlatformUid()) .and("roleid", "=", Roles.club01)); List stid = userRoles.stream().map(Sys_user_role::getStid).collect(Collectors.toList()); @@ -392,7 +392,7 @@ public class ClubUserCountController { .formatted(DateUtil.thisYear()))); } } - if(!ShiroUtil.hasAnyRoles("sysadmin, A06, xxhgly")) { + if(!ShiroUtil.hasAnyRoles("sysadmin, SchoolUnionAdmin, xxhgly")) { List userRoles = dao.query(Sys_user_role.class, Cnd.where("userid", "=", ShiroUtil.getPlatformUid()) .and("roleid", "=", Roles.club01)); List stid = userRoles.stream().map(Sys_user_role::getStid).collect(Collectors.toList()); diff --git a/src/main/java/io/v/nutz/sys/controllers/platform/sys/club/SysClubCon.java b/src/main/java/io/v/nutz/sys/controllers/platform/sys/club/SysClubCon.java index c7c8b00..c584cbf 100644 --- a/src/main/java/io/v/nutz/sys/controllers/platform/sys/club/SysClubCon.java +++ b/src/main/java/io/v/nutz/sys/controllers/platform/sys/club/SysClubCon.java @@ -96,7 +96,7 @@ public class SysClubCon { .and("roleid", "in", Lang.array(Roles.club01, Roles.club02, Roles.club03, Roles.club04))); } else { //变更社团负责人，如果是管理员直接变更完成 - if (ShiroUtil.hasAnyRoles("sysadmin, A06, xxhgly")) { + if (ShiroUtil.hasAnyRoles("sysadmin, SchoolUnionAdmin, xxhgly")) { //先清除原始身份的角色 dao.clear(Sys_user_role.class, Cnd.where("stid", "=", clubId).and("userid", "=", fetch.getUserid()) .and("roleid", "in", Lang.array(Roles.club01, Roles.club02, Roles.club03, Roles.club04))); @@ -184,7 +184,7 @@ public class SysClubCon { Cnd cnd = Cnd.NEW(); cnd.and("state", "=", ClubRegistAuditState.SCHOOL_PASS); - if (ShiroUtil.hasAnyRoles(new String[]{"sysadmin", "A06"})) { + if (ShiroUtil.hasAnyRoles(new String[]{"sysadmin", "SchoolUnionAdmin"})) { } else { cnd.and("club.concatPerson", "=", ShiroUtil.getPrincipalProperty("id")); } @@ -277,7 +277,7 @@ public class SysClubCon { record.set("name", "------"); } - if (ShiroUtil.hasAnyRoles(new String[]{"sysadmin", "A06", "xxhgly"})) { + if (ShiroUtil.hasAnyRoles(new String[]{"sysadmin", "SchoolUnionAdmin", "xxhgly"})) { record.set("child", sysClubService.query(Cnd.where("state", "=", ClubRegistAuditState.SCHOOL_PASS).asc("code"))); } else { List userRoles = dao.query(Sys_user_role.class, Cnd.where("userid", "=", ShiroUtil.getPrincipalProperty("id")) diff --git a/src/main/java/io/v/nutz/sys/controllers/platform/sys/club/SysClubUserCon.java b/src/main/java/io/v/nutz/sys/controllers/platform/sys/club/SysClubUserCon.java index f9a9ac3..2172b86 100644 --- a/src/main/java/io/v/nutz/sys/controllers/platform/sys/club/SysClubUserCon.java +++ b/src/main/java/io/v/nutz/sys/controllers/platform/sys/club/SysClubUserCon.java @@ -85,7 +85,7 @@ public class SysClubUserCon { @ViReturn @RequiresAuthentication public Object getMyMangeClub() { - if (ShiroUtil.hasAnyRoles(new String[]{"sysadmin", "A06"})) { + if (ShiroUtil.hasAnyRoles(new String[]{"sysadmin", "SchoolUnionAdmin"})) { return sysClubService.query(Cnd.where("isjs", "=", false).asc("create_time")); } @@ -239,9 +239,9 @@ public class SysClubUserCon { } //暂时屏蔽了校工会审核 - //int status = ShiroUtil.hasAnyRoles("sysadmin, A06, xxhgly") ? 5 : 3; + //int status = ShiroUtil.hasAnyRoles("sysadmin, SchoolUnionAdmin, xxhgly") ? 5 : 3; int status = 0; - if (ShiroUtil.hasAnyRoles("sysadmin, A06, xxhgly") || sf == 2) { + if (ShiroUtil.hasAnyRoles("sysadmin, SchoolUnionAdmin, xxhgly") || sf == 2) { status = 5; } else { status = 3; @@ -266,7 +266,7 @@ public class SysClubUserCon { Sys_club sysClub = dao.fetch(Sys_club.class, clubid); for (String user : users) { - if (ShiroUtil.hasAnyRoles("sysadmin, A06, xxhgly") && sf != 2) { + if (ShiroUtil.hasAnyRoles("sysadmin, SchoolUnionAdmin, xxhgly") && sf != 2) { Sys_user_role sys_user_role = new Sys_user_role(); sys_user_role.setUserId(user); sys_user_role.setRoleId(getRoleId(sf)); diff --git a/src/main/java/io/v/nutz/sys/controllers/platform/sys/club/applyIn/ClubApplyAuditController.java b/src/main/java/io/v/nutz/sys/controllers/platform/sys/club/applyIn/ClubApplyAuditController.java index 91f44b6..a7ce2c8 100644 --- a/src/main/java/io/v/nutz/sys/controllers/platform/sys/club/applyIn/ClubApplyAuditController.java +++ b/src/main/java/io/v/nutz/sys/controllers/platform/sys/club/applyIn/ClubApplyAuditController.java @@ -139,7 +139,7 @@ public class ClubApplyAuditController { cnd.andEX("u.sex", "=", sex); cnd.andEX("u.unitid", "=", unitid); - if (!ShiroUtil.hasAnyRoles(new String[]{"sysadmin", "A06"})) { + if (!ShiroUtil.hasAnyRoles(new String[]{"sysadmin", "SchoolUnionAdmin"})) { if (ShiroUtil.hasAnyRoles("club01, club02, club03, club04")) { cnd.and(new Static(""" scu.clubid IN ( SELECT stid FROM sys_user_role WHERE roleid in ('%s','%s','%s','%s') AND userid = '%s' AND stid IS NOT NULL ) @@ -235,7 +235,7 @@ public class ClubApplyAuditController { cnd.and("state", "=", ClubRegistAuditState.SCHOOL_PASS); cnd.and("isjs", "=", false); - if (!ShiroUtil.hasAnyRoles(new String[]{"sysadmin", "A06"})) { + if (!ShiroUtil.hasAnyRoles(new String[]{"sysadmin", "SchoolUnionAdmin"})) { if (ShiroUtil.hasAnyRoles("club01, club02, club03, club04")) { cnd.and(new Static(""" club.id IN ( SELECT stid FROM sys_user_role WHERE roleid in ('%s','%s','%s','%s') AND userid = '%s' AND stid IS NOT NULL ) @@ -272,7 +272,7 @@ public class ClubApplyAuditController { /*if(ShiroUtil.hasAnyRoles(new String[]{"sysadmin"})) { str = "'1', '3'"; has_str = " status not in ('1', '3') "; - } else if(ShiroUtil.hasAnyRoles(new String[]{"A06"})) { + } else if(ShiroUtil.hasAnyRoles(new String[]{"SchoolUnionAdmin"})) { str = "'3'"; } else { str = "'1'"; @@ -310,7 +310,7 @@ public class ClubApplyAuditController { } cnd.andEX("scu.clubid", "=", id); - if (!ShiroUtil.hasAnyRoles(new String[]{"sysadmin", "A06"})) { + if (!ShiroUtil.hasAnyRoles(new String[]{"sysadmin", "SchoolUnionAdmin"})) { if (ShiroUtil.hasAnyRoles("club01, club02, club03, club04")) { cnd.and(new Static(""" club.id IN ( SELECT stid FROM sys_user_role WHERE roleid in ('%s','%s','%s','%s') AND userid = '%s' AND stid IS NOT NULL ) diff --git a/src/main/java/io/v/nutz/sys/controllers/platform/sys/club/clubEvaluate/ClubEvaluateApplyController.java b/src/main/java/io/v/nutz/sys/controllers/platform/sys/club/clubEvaluate/ClubEvaluateApplyController.java index 249e6e1..1926f07 100644 --- a/src/main/java/io/v/nutz/sys/controllers/platform/sys/club/clubEvaluate/ClubEvaluateApplyController.java +++ b/src/main/java/io/v/nutz/sys/controllers/platform/sys/club/clubEvaluate/ClubEvaluateApplyController.java @@ -102,7 +102,7 @@ public class ClubEvaluateApplyController { """); Cnd cnd = Cnd.NEW(); cnd.and("club.state", "=", ClubRegistAuditState.SCHOOL_PASS); - if (!ShiroUtil.hasAnyRoles("sysadmin, A06, xxhgly")) { + if (!ShiroUtil.hasAnyRoles("sysadmin, SchoolUnionAdmin, xxhgly")) { cnd.and("ur.userid", "=", ShiroUtil.getPrincipalProperty("id")); cnd.and("ur.roleid", "in", Lang.array(Roles.club01, Roles.club02, Roles.club03, Roles.club04)); } diff --git a/src/main/java/io/v/nutz/sys/controllers/platform/sys/club/clubEvaluate/ClubEvaluateMineController.java b/src/main/java/io/v/nutz/sys/controllers/platform/sys/club/clubEvaluate/ClubEvaluateMineController.java index d3f5243..bfd3dc2 100644 --- a/src/main/java/io/v/nutz/sys/controllers/platform/sys/club/clubEvaluate/ClubEvaluateMineController.java +++ b/src/main/java/io/v/nutz/sys/controllers/platform/sys/club/clubEvaluate/ClubEvaluateMineController.java @@ -83,7 +83,7 @@ public class ClubEvaluateMineController { cnd.andEx("ce.clubId", "=", clubId); cnd.andEx("year(ce.applyTime)", "=", applyYear); - if(!ShiroUtil.hasAnyRoles("sysadmin, A06, xxhgly")) { + if(!ShiroUtil.hasAnyRoles("sysadmin, SchoolUnionAdmin, xxhgly")) { cnd.and("ce.userId", "=", ShiroUtil.getPlatformUid()); } diff --git a/src/main/java/io/v/nutz/sys/controllers/platform/sys/club/manage/ClubInfoManageController.java b/src/main/java/io/v/nutz/sys/controllers/platform/sys/club/manage/ClubInfoManageController.java index 6ad2d45..b93a1f8 100644 --- a/src/main/java/io/v/nutz/sys/controllers/platform/sys/club/manage/ClubInfoManageController.java +++ b/src/main/java/io/v/nutz/sys/controllers/platform/sys/club/manage/ClubInfoManageController.java @@ -152,7 +152,7 @@ public class ClubInfoManageController { cnd.and("isjs", "=", false); cnd.and("state", "=", ClubRegistAuditState.SCHOOL_PASS); - if(!ShiroUtil.hasAnyRoles("sysadmin, A06, xxhgly")) { + if(!ShiroUtil.hasAnyRoles("sysadmin, SchoolUnionAdmin, xxhgly")) { List userRoles = dao.query(Sys_user_role.class, Cnd.where("userid", "=", ShiroUtil.getPlatformUid()) .and("roleid", "=", Roles.club01)); List stid = userRoles.stream().map(Sys_user_role::getStid).collect(Collectors.toList()); diff --git a/src/main/java/io/v/nutz/sys/controllers/platform/sys/club/manage/ClubSchoolAuditRuleController.java b/src/main/java/io/v/nutz/sys/controllers/platform/sys/club/manage/ClubSchoolAuditRuleController.java index 0eff36b..885a186 100644 --- a/src/main/java/io/v/nutz/sys/controllers/platform/sys/club/manage/ClubSchoolAuditRuleController.java +++ b/src/main/java/io/v/nutz/sys/controllers/platform/sys/club/manage/ClubSchoolAuditRuleController.java @@ -74,7 +74,7 @@ public class ClubSchoolAuditRuleController { cnd.and("ruleState", "=", 1); cnd.and("state", "=", ClubRegistAuditState.SCHOOL_PASS); - if(!ShiroUtil.hasAnyRoles("sysadmin, A06, xxhgly")) { + if(!ShiroUtil.hasAnyRoles("sysadmin, SchoolUnionAdmin, xxhgly")) { cnd.and("c.userid", "=", ShiroUtil.getPlatformUid()); } diff --git a/src/main/java/io/v/nutz/sys/controllers/platform/sys/club/needItems/ClubNeedItemsController.java b/src/main/java/io/v/nutz/sys/controllers/platform/sys/club/needItems/ClubNeedItemsController.java index 2fb542c..1d7e2f5 100644 --- a/src/main/java/io/v/nutz/sys/controllers/platform/sys/club/needItems/ClubNeedItemsController.java +++ b/src/main/java/io/v/nutz/sys/controllers/platform/sys/club/needItems/ClubNeedItemsController.java @@ -65,7 +65,7 @@ public class ClubNeedItemsController { private int getClubRegistCount(Boolean flag, String roleId, Integer state) { Cnd cnd = Cnd.NEW(); - if (flag && !ShiroUtil.hasAnyRoles("sysadmin, A06, xxhgly")) { + if (flag && !ShiroUtil.hasAnyRoles("sysadmin, SchoolUnionAdmin, xxhgly")) { List roles = dao.query(Sys_user_role.class, Cnd.where("userId", "=", ShiroUtil.getPrincipalProperty("id")).and("roleId", "=", roleId)); if (Lang.isNotEmpty(roles)) { List stids = roles.stream().map(Sys_user_role::getStid).collect(Collectors.toList()); @@ -92,7 +92,7 @@ public class ClubNeedItemsController { private int getClubApplyCount(String roleId, Integer state) { Cnd cnd = Cnd.NEW(); - if (!ShiroUtil.hasAnyRoles("sysadmin, A06, xxhgly")) { + if (!ShiroUtil.hasAnyRoles("sysadmin, SchoolUnionAdmin, xxhgly")) { List roles = dao.query(Sys_user_role.class, Cnd.where("userId", "=", ShiroUtil.getPrincipalProperty("id")).and("roleId", "=", roleId)); if (Lang.isNotEmpty(roles)) { List stids = roles.stream().map(Sys_user_role::getStid).collect(Collectors.toList()); @@ -144,7 +144,7 @@ public class ClubNeedItemsController { private int getClubEvaluateCount(Boolean flag, String roleId, Integer state) { Cnd cnd = Cnd.NEW(); - if (flag && !ShiroUtil.hasAnyRoles("sysadmin, A06, xxhgly")) { + if (flag && !ShiroUtil.hasAnyRoles("sysadmin, SchoolUnionAdmin, xxhgly")) { List roles = dao.query(Sys_user_role.class, Cnd.where("userId", "=", ShiroUtil.getPrincipalProperty("id")).and("roleId", "=", roleId)); if (Lang.isNotEmpty(roles)) { List stids = roles.stream().map(Sys_user_role::getStid).collect(Collectors.toList()); diff --git a/src/main/java/io/v/nutz/sys/controllers/platform/sys/club/regist/ClubConfirmController.java b/src/main/java/io/v/nutz/sys/controllers/platform/sys/club/regist/ClubConfirmController.java index d0fe924..e1b2edc 100644 --- a/src/main/java/io/v/nutz/sys/controllers/platform/sys/club/regist/ClubConfirmController.java +++ b/src/main/java/io/v/nutz/sys/controllers/platform/sys/club/regist/ClubConfirmController.java @@ -61,7 +61,7 @@ public class ClubConfirmController { } else { cnd.and("c.state", "=", ClubRegistAuditState.ST_CONFIRM); } - if(!ShiroUtil.hasAnyRoles("sysadmin, A06, xxhgly")) { + if(!ShiroUtil.hasAnyRoles("sysadmin, SchoolUnionAdmin, xxhgly")) { List userRoles = dao.query(Sys_user_role.class, Cnd.where("userid", "=", ShiroUtil.getPlatformUid()) .and("roleid", "=", Roles.club01)); List stid = userRoles.stream().map(Sys_user_role::getStid).collect(Collectors.toList()); diff --git a/src/main/java/io/v/nutz/sys/controllers/platform/sys/club/regist/ClubMyApplyController.java b/src/main/java/io/v/nutz/sys/controllers/platform/sys/club/regist/ClubMyApplyController.java index 5adb6c0..bd6e30b 100644 --- a/src/main/java/io/v/nutz/sys/controllers/platform/sys/club/regist/ClubMyApplyController.java +++ b/src/main/java/io/v/nutz/sys/controllers/platform/sys/club/regist/ClubMyApplyController.java @@ -80,7 +80,7 @@ public class ClubMyApplyController { cnd.andEx("c.name", "LIKE", "%" + name + "%"); cnd.andEx("year(c.create_time)", "=", year); - if(!ShiroUtil.hasAnyRoles("sysadmin, A06, xxhgly")) { + if(!ShiroUtil.hasAnyRoles("sysadmin, SchoolUnionAdmin, xxhgly")) { cnd.and("c.userid", "=", ShiroUtil.getPlatformUid()); } diff --git a/src/main/java/io/v/nutz/sys/controllers/platform/sys/club/regist/ClubRegistApplyController.java b/src/main/java/io/v/nutz/sys/controllers/platform/sys/club/regist/ClubRegistApplyController.java index 892b302..d051474 100644 --- a/src/main/java/io/v/nutz/sys/controllers/platform/sys/club/regist/ClubRegistApplyController.java +++ b/src/main/java/io/v/nutz/sys/controllers/platform/sys/club/regist/ClubRegistApplyController.java @@ -61,7 +61,7 @@ public class ClubRegistApplyController { @Param(value = "::managePerson", required = false) List managePerson) throws IOException { club.setIsjs(false); - if (ShiroUtil.hasAnyRoles("sysadmin, A06, xxhgly")) { + if (ShiroUtil.hasAnyRoles("sysadmin, SchoolUnionAdmin, xxhgly")) { club.setFoundTime(DateUtil.getDateTime()); club.setState(isSave ? ClubRegistAuditState.NOT_SUBMIT : ClubRegistAuditState.SCHOOL_PASS); } else { @@ -90,7 +90,7 @@ public class ClubRegistApplyController { clubUsers.add(cUser); //如果是管理员创建的社团，直接加角色 - if (ShiroUtil.hasAnyRoles("sysadmin, A06, xxhgly")) { + if (ShiroUtil.hasAnyRoles("sysadmin, SchoolUnionAdmin, xxhgly")) { Sys_user_role uRole = new Sys_user_role(); uRole.setUserId(item.getString("userId")); uRole.setRoleId(getRoleId(item.getInt("sf"))); @@ -99,7 +99,7 @@ public class ClubRegistApplyController { } } }); - if (ShiroUtil.hasAnyRoles("sysadmin, A06, xxhgly")) { + if (ShiroUtil.hasAnyRoles("sysadmin, SchoolUnionAdmin, xxhgly")) { dao.insert(userRoles); } dao.insert(clubUsers); @@ -130,12 +130,12 @@ public class ClubRegistApplyController { @Param(value = "::deleteIds", required = false) List deleteIds, @Param(value = "::managePerson", required = false) List managePerson) throws IOException { - if (!isSave && !ShiroUtil.hasAnyRoles("sysadmin, A06, xxhgly")) { + if (!isSave && !ShiroUtil.hasAnyRoles("sysadmin, SchoolUnionAdmin, xxhgly")) { club.setState(ClubRegistAuditState.XT_READY); club.setXtAuditId(""); club.setXldAuditId(""); } - if (!isSave && ShiroUtil.hasAnyRoles("sysadmin, A06, xxhgly")) { + if (!isSave && ShiroUtil.hasAnyRoles("sysadmin, SchoolUnionAdmin, xxhgly")) { club.setState(ClubRegistAuditState.SCHOOL_PASS); club.setXtAuditId(""); club.setXldAuditId(""); 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 a9b2905..fbbad82 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 @@ -280,7 +280,7 @@ public class ActivityBasicScopeController { public Object getRolesAndUnion() { return new NutMap() {{ addv("is_H10", ShiroUtil.hasRole("H10")); - addv("is_A06", ShiroUtil.hasRole("A06")); + addv("is_A06", ShiroUtil.hasRole("SchoolUnionAdmin")); addv("is_H04", ShiroUtil.hasRole("H04")); addv("is_H02", ShiroUtil.hasRole("club01")); addv("is_H03", ShiroUtil.hasRole("SchoolUnionMemberAdmin")); 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 b816108..43be037 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,SCHOOL_UNION_SPORTS_ADMIN")) { + if (!ShiroUtil.hasAnyRoles("sysadmin,SchoolUnionAdmin,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 f56f2b5..f9762cf 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 @@ -63,7 +63,7 @@ public class ActivityUnionController { } private boolean checkRole() { - if (ShiroUtil.hasAnyRoles(new String[]{"sysadmin", "A06"})) { + if (ShiroUtil.hasAnyRoles(new String[]{"sysadmin", "SchoolUnionAdmin"})) { return true; } return false; @@ -126,7 +126,7 @@ public class ActivityUnionController { LEFT JOIN sys_dict dict ON dict.`code` = role.`code` LEFT JOIN `user` u ON sur.userId = u.id $condition - order by FIELD( role.`code`, 'wyh01', 'wyh02', 'A06', 'wyh03', 'tamange', 'flwyh01', 'H10', 'xghng', 'SchoolUnionAccountant' ) + order by FIELD( role.`code`, 'wyh01', 'wyh02', 'SchoolUnionAdmin', 'wyh03', 'tamange', 'flwyh01', 'H10', 'xghng', 'SchoolUnionAccountant' ) """); Cnd cnd = Cnd.NEW(); @@ -202,7 +202,7 @@ public class ActivityUnionController { if (Strings.isNotBlank(searchName) && Strings.isNotBlank(searchKeyword)) { cnd.and(searchName, "like", "%" + searchKeyword + "%"); } - if (!ShiroUtil.hasAnyRoles("sysadmin,A06,SCHOOL_UNION_SPORTS_ADMIN")) { + if (!ShiroUtil.hasAnyRoles("sysadmin,SchoolUnionAdmin,SCHOOL_UNION_SPORTS_ADMIN")) { cnd.and("gh.id", "=", basicUnit.getUnionid()); } if (Strings.isNotBlank(pageOrderName) && Strings.isNotBlank(pageOrderBy)) { 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 3b03bf0..135477f 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 @@ -414,8 +414,8 @@ public class ActivityApplyController { apply.setActivityUnionName(basicUnion.getUnionname()); apply.setApplyUnitId(basicUnit.getId()); - dao.update(Sys_user.class, Chain.make("mobile", apply.getMobile()).add("position", apply.getPosition()), - Cnd.where("id", "=", apply.getUserId())); +// dao.update(Sys_user.class, Chain.make("mobile", apply.getMobile()).add("position", apply.getPosition()), +// Cnd.where("id", "=", apply.getUserId())); } activitySchoolApplyService.doApplies(activityId, basicUnit.getUnionid(), eventId, Arrays.asList(applies)); return null; 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 b186743..504794a 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 @@ -304,7 +304,7 @@ public class ActivityCommonController { LEFT JOIN activity_event ev ON ev.id = app.eventId LEFT JOIN activity_school sc ON sc.id=app.activityId WHERE - activityId = @id + activityId = @id and ev.allName is not null and app.status=2 $cnd ORDER BY @@ -328,7 +328,7 @@ public class ActivityCommonController { z.addv("sf", s.replaceAll("[\\[\\]]", "")); }); List exportEntities = new ArrayList<>(); - exportEntities.add(new ExcelExportEntity("小队名称", "team", 20)); +// exportEntities.add(new ExcelExportEntity("小队名称", "team", 20)); exportEntities.add(new ExcelExportEntity("项目名称", "allName", 20)); exportEntities.add(new ExcelExportEntity("工号", "loginname", 20)); exportEntities.add(new ExcelExportEntity("姓名", "username", 20)); @@ -336,7 +336,7 @@ public class ActivityCommonController { exportEntities.add(new ExcelExportEntity("手机号码", "mobile", 20)); exportEntities.add(new ExcelExportEntity("职称职务", "position", 20)); exportEntities.add(new ExcelExportEntity("所在单位", "unitname", 20)); - exportEntities.add(new ExcelExportEntity("身份", "sf", 20)); +// exportEntities.add(new ExcelExportEntity("身份", "sf", 20)); exportEntities.add(new ExcelExportEntity("报名人", "applyUserName", 20)); Map> listMap = list.stream().collect(Collectors.groupingBy(v -> v.getString("unionname"))); 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 56a82bb..2995814 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,SCHOOL_UNION_SPORTS_ADMIN")) { + if (!ShiroUtil.hasAnyRoles("sysadmin,SchoolUnionAdmin,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 0b8f395..2ece523 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,SCHOOL_UNION_SPORTS_ADMIN")) { + if (!ShiroUtil.hasAnyRoles("sysadmin,SchoolUnionAdmin,SCHOOL_UNION_SPORTS_ADMIN")) { if (activityLevel.equals("40002")) { cnd.and("belongUnionId", "=", getUnionId()); } @@ -137,7 +137,7 @@ public class ActivityReadingController { // cnd.and("YEAR(app.applyDate)", "=", year); sql.setCondition(cnd); - if (!ShiroUtil.hasAnyRoles("sysadmin,A06,SCHOOL_UNION_SPORTS_ADMIN")) { + if (!ShiroUtil.hasAnyRoles("sysadmin,SchoolUnionAdmin,SCHOOL_UNION_SPORTS_ADMIN")) { if (ShiroUtil.hasRole("H04") && activityLevel.equals("40002")) { cnd.and("app.activityUnionId", "=", basicUnit.getUnionid()); cnd.and("school.belongUnionId", "=", basicUnit.getUnionid()); @@ -152,7 +152,7 @@ public class ActivityReadingController { List apply = new ArrayList(); Cnd unionCnd = Cnd.NEW(); - if (!ShiroUtil.hasAnyRoles("sysadmin,A06,SCHOOL_UNION_SPORTS_ADMIN")) { + if (!ShiroUtil.hasAnyRoles("sysadmin,SchoolUnionAdmin,SCHOOL_UNION_SPORTS_ADMIN")) { if (ShiroUtil.hasRole("H04")) { unionCnd.and("id", "=", basicUnit.getUnionid()); } @@ -355,7 +355,7 @@ public class ActivityReadingController { } - if (!ShiroUtil.hasAnyRoles("sysadmin,A06,H10,SCHOOL_UNION_SPORTS_ADMIN")) { + if (!ShiroUtil.hasAnyRoles("sysadmin,SchoolUnionAdmin,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 81bb20a..f5a9631 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,SCHOOL_UNION_SPORTS_ADMIN")) { + if (!ShiroUtil.hasAnyRoles("sysadmin,SchoolUnionAdmin,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 966d603..0c0f64e 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,SCHOOL_UNION_SPORTS_ADMIN")) { + if (!ShiroUtil.hasAnyRoles("sysadmin,SchoolUnionAdmin,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 daea1e3..7e0ade3 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,SCHOOL_UNION_SPORTS_ADMIN")) { + if (!ShiroUtil.hasAnyRoles("sysadmin,SchoolUnionAdmin,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/SiteRetireProcessController.java b/src/main/java/io/v/nutz/zhgh/activity/controller/site/SiteRetireProcessController.java index eed970b..90cfff9 100644 --- a/src/main/java/io/v/nutz/zhgh/activity/controller/site/SiteRetireProcessController.java +++ b/src/main/java/io/v/nutz/zhgh/activity/controller/site/SiteRetireProcessController.java @@ -94,7 +94,7 @@ public class SiteRetireProcessController { CndPlus cnd = CndPlus.create(); cnd.and("asr.reserve_state", "true".equals(isAudit) ? ">" : "false".equals(isAudit) ? "=" : ">=", 6090); cnd.and("asr.isRetire","=",1); -// if (!ShiroUtil.hasAnyRoles("sysadmin,A06")) { +// if (!ShiroUtil.hasAnyRoles("sysadmin,SchoolUnionAdmin")) { // cnd.and("reserve_person_unionid", "=", Vi.getUnionId()); // } 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 c4ddb5e..874f1d9 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,SCHOOL_UNION_SPORTS_ADMIN")) { + if (!ShiroUtil.hasAnyRoles("sysadmin,SchoolUnionAdmin,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 bc7b811..5aadb1b 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,SCHOOL_UNION_SPORTS_ADMIN")) { + if (!ShiroUtil.hasAnyRoles("SchoolUnionAdmin,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 162aa4f..3159de4 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 @@ -158,7 +158,7 @@ public class ActivityUnionManageController { tissue.setUserId(ShiroUtil.getUserId()); } tissue.setApplyTime(DateUtil.getDate()); - if (!ShiroUtil.hasAnyRoles("sysadmin,A06,SCHOOL_UNION_SPORTS_ADMIN")) { + if (!ShiroUtil.hasAnyRoles("sysadmin,SchoolUnionAdmin,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 7e4d581..0802604 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,SCHOOL_UNION_SPORTS_ADMIN")) { + if (!ShiroUtil.hasAnyRoles("sysadmin,SchoolUnionAdmin,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 620daf0..1f77fbf 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", "SCHOOL_UNION_SPORTS_ADMIN"})) { + if (!ShiroUtil.hasAnyRoles(new String[]{"sysadmin", "SchoolUnionAdmin", "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", "SCHOOL_UNION_SPORTS_ADMIN"})) { + if (!ShiroUtil.hasAnyRoles(new String[]{"sysadmin", "SchoolUnionAdmin", "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 aadfe2f..6d48228 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,SCHOOL_UNION_SPORTS_ADMIN")) { + if (!ShiroUtil.hasAnyRoles("sysadmin,H10,SchoolUnionAdmin,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 5999d11..0ec3d91 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,SCHOOL_UNION_SPORTS_ADMIN")) { + if (!ShiroUtil.hasAnyRoles("sysadmin,H10,SchoolUnionAdmin,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/java/io/v/nutz/zhgh/data/constant/DataConstant.java b/src/main/java/io/v/nutz/zhgh/data/constant/DataConstant.java index c7ce373..011abd9 100644 --- a/src/main/java/io/v/nutz/zhgh/data/constant/DataConstant.java +++ b/src/main/java/io/v/nutz/zhgh/data/constant/DataConstant.java @@ -513,7 +513,7 @@ public class DataConstant { put("A03", "其他专业技术"); put("A04", "管理"); put("A05", "工勤"); - put("A06", "其他"); + put("SchoolUnionAdmin", "其他"); put("B01", "专职科研"); put("B02", "博士后统招"); put("B03", "博士后在职"); diff --git a/src/main/java/io/v/nutz/zhgh/diseaseaid/controller/aidfund/BatchJoinController.java b/src/main/java/io/v/nutz/zhgh/diseaseaid/controller/aidfund/BatchJoinController.java index 8dbec24..c6eacca 100644 --- a/src/main/java/io/v/nutz/zhgh/diseaseaid/controller/aidfund/BatchJoinController.java +++ b/src/main/java/io/v/nutz/zhgh/diseaseaid/controller/aidfund/BatchJoinController.java @@ -153,7 +153,7 @@ public class BatchJoinController { aidFundMemberAuditRecord.setUnionAuditId(audit.getId()); aidFundMemberAuditRecord.setStateId(AidFundMemberAuditState.RETIRED_CADRE); num = AidFundMemberMode.NONE.getCode(); - } else if (ShiroUtil.hasRole("A06") && !ShiroUtil.hasRole("sysadmin")) { + } else if (ShiroUtil.hasRole("SchoolUnionAdmin") && !ShiroUtil.hasRole("sysadmin")) { aidFundMemberAuditRecord.setRetirementAuditId(audit.getId()); aidFundMemberAuditRecord.setStateId(AidFundMemberAuditState.AID_FUND); num = AidFundMemberMode.NONE.getCode(); diff --git a/src/main/java/io/v/nutz/zhgh/fitnessWalk/controller/FitnessWalkActivityBindingRecordController.java b/src/main/java/io/v/nutz/zhgh/fitnessWalk/controller/FitnessWalkActivityBindingRecordController.java index 446bd58..390c278 100644 --- a/src/main/java/io/v/nutz/zhgh/fitnessWalk/controller/FitnessWalkActivityBindingRecordController.java +++ b/src/main/java/io/v/nutz/zhgh/fitnessWalk/controller/FitnessWalkActivityBindingRecordController.java @@ -63,7 +63,7 @@ public class FitnessWalkActivityBindingRecordController { sql.append("])"); sql.append(")"); } - if (!ShiroUtil.hasAnyRoles("sysadmin,A06")) { + if (!ShiroUtil.hasAnyRoles("sysadmin,SchoolUnionAdmin")) { sql.append(".where({'data.unionid':'").append(Vi.getUnionId()).append("'})"); } else { if (Strings.isNotBlank(unionId)) sql.append(".where({'data.unionid':'").append(unionId).append("'})"); diff --git a/src/main/java/io/v/nutz/zhgh/fitnessWalk/controller/FitnessWalkActivityManageController.java b/src/main/java/io/v/nutz/zhgh/fitnessWalk/controller/FitnessWalkActivityManageController.java index 3542df0..989a762 100644 --- a/src/main/java/io/v/nutz/zhgh/fitnessWalk/controller/FitnessWalkActivityManageController.java +++ b/src/main/java/io/v/nutz/zhgh/fitnessWalk/controller/FitnessWalkActivityManageController.java @@ -91,7 +91,7 @@ public class FitnessWalkActivityManageController { sql.append("])"); sql.append(")"); } - if (!ShiroUtil.hasAnyRoles("sysadmin,A06")) { + if (!ShiroUtil.hasAnyRoles("sysadmin,SchoolUnionAdmin")) { sql.append(".where({unionId:'").append(Vi.getUnionId()).append("'})"); } else if (StrUtil.isNotBlank(unionId)) { sql.append(".where({unionId:'").append(unionId).append("'})"); @@ -146,7 +146,7 @@ public class FitnessWalkActivityManageController { fitnessWalkActivity.setCompletionCertificateCover(fileId); } - if (ShiroUtil.hasRole("H04") && !ShiroUtil.hasAnyRoles("sysadmin,SchoolUnionAdmin,SchoolUnionFitnessWalkAdmin,A06")) { + if (ShiroUtil.hasRole("H04") && !ShiroUtil.hasAnyRoles("sysadmin,SchoolUnionAdmin,SchoolUnionFitnessWalkAdmin,SchoolUnionAdmin")) { fitnessWalkActivity.setUnionId(Vi.getUnionId()); } else { fitnessWalkActivity.setUnionId(""); @@ -241,7 +241,7 @@ public class FitnessWalkActivityManageController { } - if (ShiroUtil.hasRole("H04") && !ShiroUtil.hasAnyRoles("sysadmin,SchoolUnionAdmin,SchoolUnionFitnessWalkAdmin,A06")) { + if (ShiroUtil.hasRole("H04") && !ShiroUtil.hasAnyRoles("sysadmin,SchoolUnionAdmin,SchoolUnionFitnessWalkAdmin,SchoolUnionAdmin")) { fitnessWalkActivity.setUnionId(Vi.getUnionId()); } else { fitnessWalkActivity.setUnionId(""); diff --git a/src/main/java/io/v/nutz/zhgh/fitnessWalk/service/impl/FitnessWalkCommonServiceImpl.java b/src/main/java/io/v/nutz/zhgh/fitnessWalk/service/impl/FitnessWalkCommonServiceImpl.java index 992ae68..584f259 100644 --- a/src/main/java/io/v/nutz/zhgh/fitnessWalk/service/impl/FitnessWalkCommonServiceImpl.java +++ b/src/main/java/io/v/nutz/zhgh/fitnessWalk/service/impl/FitnessWalkCommonServiceImpl.java @@ -124,7 +124,7 @@ public class FitnessWalkCommonServiceImpl extends ViServiceImpl implements Fitne } } - if (ShiroUtil.hasRole("H04") && !ShiroUtil.hasAnyRoles("sysadmin,A06")) { + if (ShiroUtil.hasRole("H04") && !ShiroUtil.hasAnyRoles("sysadmin,SchoolUnionAdmin")) { return Vi.getUnionId().equals(activity.getUnionId()) ? activity : null; } return activity; @@ -150,7 +150,7 @@ public class FitnessWalkCommonServiceImpl extends ViServiceImpl implements Fitne fitnessWalkActivities = jsonObject.getJSONArray("data").stream().map(v -> JSON.parseObject((String) v, FitnessWalkActivity.class)).collect(Collectors.toList()); } - if (ShiroUtil.hasRole("H04") && !ShiroUtil.hasAnyRoles("sysadmin,SchoolUnionAdmin,SchoolUnionFitnessWalkAdmin,A06")) { + if (ShiroUtil.hasRole("H04") && !ShiroUtil.hasAnyRoles("sysadmin,SchoolUnionAdmin,SchoolUnionFitnessWalkAdmin,SchoolUnionAdmin")) { fitnessWalkActivities = fitnessWalkActivities.stream().filter(v -> Vi.getUnionId().equals(v.getUnionId())).collect(Collectors.toList()); } redisService.set("FitnessWalk:ActivityList", JSONObject.toJSONString(fitnessWalkActivities)); diff --git a/src/main/java/io/v/nutz/zhgh/fourOneActivity/controller/FourOneActivityApplyListController.java b/src/main/java/io/v/nutz/zhgh/fourOneActivity/controller/FourOneActivityApplyListController.java index 3e1dd39..6f94c30 100644 --- a/src/main/java/io/v/nutz/zhgh/fourOneActivity/controller/FourOneActivityApplyListController.java +++ b/src/main/java/io/v/nutz/zhgh/fourOneActivity/controller/FourOneActivityApplyListController.java @@ -78,7 +78,7 @@ public class FourOneActivityApplyListController { LEFT JOIN audit_state st ON st.stateId = a.stateId $condition """); - if (!ShiroUtil.hasAnyRoles("sysadmin,A06")){ + if (!ShiroUtil.hasAnyRoles("sysadmin,SchoolUnionAdmin")){ cnd.and("a.activityApplyUserId","=",ShiroUtil.getUserId()); } cnd.andEX("YEAR(a.activityApplyDate)", "=", year); diff --git a/src/main/java/io/v/nutz/zhgh/healthCheckup/controller/HealthCheckupListController.java b/src/main/java/io/v/nutz/zhgh/healthCheckup/controller/HealthCheckupListController.java index ab87400..bf5b17e 100644 --- a/src/main/java/io/v/nutz/zhgh/healthCheckup/controller/HealthCheckupListController.java +++ b/src/main/java/io/v/nutz/zhgh/healthCheckup/controller/HealthCheckupListController.java @@ -86,7 +86,7 @@ public class HealthCheckupListController { cnd.andEX("hcu.threeUnitId", "=", threeUnitId); cnd.andEX("hcu.projectId","=",projectId); - if (!ShiroUtil.hasAnyRoles("sysadmin,A06")) { + if (!ShiroUtil.hasAnyRoles("sysadmin,SchoolUnionAdmin")) { cnd.andEX("hcu.unionId", "=", Vi.getUnionId()); } diff --git a/src/main/java/io/v/nutz/zhgh/honor/controller/HonorManageController.java b/src/main/java/io/v/nutz/zhgh/honor/controller/HonorManageController.java index 0f0e692..58233ca 100644 --- a/src/main/java/io/v/nutz/zhgh/honor/controller/HonorManageController.java +++ b/src/main/java/io/v/nutz/zhgh/honor/controller/HonorManageController.java @@ -106,7 +106,7 @@ public class HonorManageController { if (StrUtil.isNotBlank(pageOrderName) && StrUtil.isNotBlank(pageOrderBy)) { cnd.orderBy(pageOrderName, pageOrderBy); } - if (!ShiroUtil.hasAnyRoles("sysadmin,A06")) { + if (!ShiroUtil.hasAnyRoles("sysadmin,SchoolUnionAdmin")) { if (ShiroUtil.hasRole("H04")) { cnd.and("u.unionid", "=", Vi.getUnionId()); } else { diff --git a/src/main/java/io/v/nutz/zhgh/jf/controller/activitybx/ReimbursementCon.java b/src/main/java/io/v/nutz/zhgh/jf/controller/activitybx/ReimbursementCon.java index 0d2ed25..8bf7d2d 100644 --- a/src/main/java/io/v/nutz/zhgh/jf/controller/activitybx/ReimbursementCon.java +++ b/src/main/java/io/v/nutz/zhgh/jf/controller/activitybx/ReimbursementCon.java @@ -87,7 +87,7 @@ public class ReimbursementCon { @ViReturn public Object doAdd(@Param(value = "activityBx", required = false) ActivityBx activityBx, @Param(value = "sign", required = false) String sign) { activityBx.setYear(Calendar.getInstance().get(Calendar.YEAR)); - if (ShiroUtil.hasAnyRoles(new String[]{"xghhdwy", "A06"}) && activityBx.getActivity_type().equals(3)) { + if (ShiroUtil.hasAnyRoles(new String[]{"xghhdwy", "SchoolUnionAdmin"}) && activityBx.getActivity_type().equals(3)) { activityBx.setState_id("1020"); activityBx.setActivity_type(3); } else if (ShiroUtil.hasAnyRoles(new String[]{"H02"}) && activityBx.getActivity_type().equals(2)) { diff --git a/src/main/java/io/v/nutz/zhgh/jf/controller/club/clubTzController.java b/src/main/java/io/v/nutz/zhgh/jf/controller/club/clubTzController.java index 24fa90c..b612e7b 100644 --- a/src/main/java/io/v/nutz/zhgh/jf/controller/club/clubTzController.java +++ b/src/main/java/io/v/nutz/zhgh/jf/controller/club/clubTzController.java @@ -119,7 +119,7 @@ public class clubTzController { $condition """); Cnd cnd = Cnd.NEW(); - if (ShiroUtil.hasRole("sysadmin") || ShiroUtil.hasRole("A06")) { + if (ShiroUtil.hasRole("sysadmin") || ShiroUtil.hasRole("SchoolUnionAdmin")) { } else { List roleids = jfClubService.dao().query(Sys_user_role.class, Cnd.where("roleId", "=", Roles.club01)); diff --git a/src/main/java/io/v/nutz/zhgh/jf/controller/reimbursement/ActivityReimbursementClubChairmanController.java b/src/main/java/io/v/nutz/zhgh/jf/controller/reimbursement/ActivityReimbursementClubChairmanController.java index 7ab546d..e816048 100644 --- a/src/main/java/io/v/nutz/zhgh/jf/controller/reimbursement/ActivityReimbursementClubChairmanController.java +++ b/src/main/java/io/v/nutz/zhgh/jf/controller/reimbursement/ActivityReimbursementClubChairmanController.java @@ -79,7 +79,7 @@ public class ActivityReimbursementClubChairmanController { //1已审核；2未审核；0全部 cnd.and("act.reimbursement_state_id", "1".equals(isAudit) ? ">" : "2".equals(isAudit) ? "=" : ">=", 1000); - if (ShiroUtil.hasAnyRoles("sysadmin,A06")){ + if (ShiroUtil.hasAnyRoles("sysadmin,SchoolUnionAdmin")){ cnd.andEX("act.clubId","=",clubId); } else { cnd.and("act.clubId","=",vi.getClubId()); diff --git a/src/main/java/io/v/nutz/zhgh/jf/controller/reimbursement/ActivityReimbursementMineController.java b/src/main/java/io/v/nutz/zhgh/jf/controller/reimbursement/ActivityReimbursementMineController.java index 771af43..64a7ecb 100644 --- a/src/main/java/io/v/nutz/zhgh/jf/controller/reimbursement/ActivityReimbursementMineController.java +++ b/src/main/java/io/v/nutz/zhgh/jf/controller/reimbursement/ActivityReimbursementMineController.java @@ -101,7 +101,7 @@ public class ActivityReimbursementMineController { $condition """); Cnd cnd = Cnd.NEW(); - if (!ShiroUtil.hasAnyRoles("sysadmin,A06")) { + if (!ShiroUtil.hasAnyRoles("sysadmin,SchoolUnionAdmin")) { SqlExpressionGroup group2 = new SqlExpressionGroup(); if (ShiroUtil.hasAnyRoles("gh01,H04")) { group2.or("u.unionid", "=", vi.getUnionId()); diff --git a/src/main/java/io/v/nutz/zhgh/jf/controller/reimbursement/ActivityReimbursementUnionChairmanController.java b/src/main/java/io/v/nutz/zhgh/jf/controller/reimbursement/ActivityReimbursementUnionChairmanController.java index 378888b..96cc127 100644 --- a/src/main/java/io/v/nutz/zhgh/jf/controller/reimbursement/ActivityReimbursementUnionChairmanController.java +++ b/src/main/java/io/v/nutz/zhgh/jf/controller/reimbursement/ActivityReimbursementUnionChairmanController.java @@ -64,7 +64,7 @@ public class ActivityReimbursementUnionChairmanController { //1已审核；2未审核；0全部 cnd.and("act.reimbursement_state_id", "1".equals(isAudit) ? ">" : "2".equals(isAudit) ? "=" : ">=", 1010); - if (ShiroUtil.hasAnyRoles("sysadmin,A06")){ + if (ShiroUtil.hasAnyRoles("sysadmin,SchoolUnionAdmin")){ cnd.andEX("u.unionid","=",unionId); } else { cnd.and("u.unionid","=", Vi.getUnionId()); diff --git a/src/main/java/io/v/nutz/zhgh/jf/controller/yjgh/jfsyController.java b/src/main/java/io/v/nutz/zhgh/jf/controller/yjgh/jfsyController.java index c69c583..ff9f602 100644 --- a/src/main/java/io/v/nutz/zhgh/jf/controller/yjgh/jfsyController.java +++ b/src/main/java/io/v/nutz/zhgh/jf/controller/yjgh/jfsyController.java @@ -73,7 +73,7 @@ public class jfsyController { $condition """); Cnd cnd = Cnd.NEW(); - if (ShiroUtil.hasRole("sysadmin") || ShiroUtil.hasRole("A06")) { + if (ShiroUtil.hasRole("sysadmin") || ShiroUtil.hasRole("SchoolUnionAdmin")) { cnd.andEX("yjgh.id", "=", unionId); } else if (ShiroUtil.hasRole("H04")) { //基层工会管理员 @@ -119,7 +119,7 @@ public class jfsyController { "ON jf.unionId = yjgh.id \n" + "AND jf.`year` = @year $condition"); Cnd cnd = Cnd.NEW(); - if (ShiroUtil.hasRole("sysadmin") || ShiroUtil.hasRole("A06")) { + if (ShiroUtil.hasRole("sysadmin") || ShiroUtil.hasRole("SchoolUnionAdmin")) { } else if (ShiroUtil.hasRole("H04")) { //基层工会管理员 diff --git a/src/main/java/io/v/nutz/zhgh/loveSubsidy/controller/LoveSubsidyBranchUnionAuditController.java b/src/main/java/io/v/nutz/zhgh/loveSubsidy/controller/LoveSubsidyBranchUnionAuditController.java index f431df3..7512321 100644 --- a/src/main/java/io/v/nutz/zhgh/loveSubsidy/controller/LoveSubsidyBranchUnionAuditController.java +++ b/src/main/java/io/v/nutz/zhgh/loveSubsidy/controller/LoveSubsidyBranchUnionAuditController.java @@ -57,7 +57,7 @@ public class LoveSubsidyBranchUnionAuditController { public Result pageData(PageForm pageForm, @Param(required = false, value = "year") Integer year, Integer isAudit) { Cnd cnd = Cnd.NEW(); cnd.andEX("YEAR(applyDate)", "=", year); - if (!ShiroUtil.hasAnyRoles("sysadmin,A06")) { + if (!ShiroUtil.hasAnyRoles("sysadmin,SchoolUnionAdmin")) { cnd.and("unionId", "=", Vi.getUnionId()); } if (Strings.isNotBlank(pageForm.getSearchName()) && Strings.isNotBlank(pageForm.getSearchKeyword())) { diff --git a/src/main/java/io/v/nutz/zhgh/medicalMutualAidFund/controller/MedicalMutualAidFundBranchUnionAuditController.java b/src/main/java/io/v/nutz/zhgh/medicalMutualAidFund/controller/MedicalMutualAidFundBranchUnionAuditController.java index 8ea790a..c0039d2 100644 --- a/src/main/java/io/v/nutz/zhgh/medicalMutualAidFund/controller/MedicalMutualAidFundBranchUnionAuditController.java +++ b/src/main/java/io/v/nutz/zhgh/medicalMutualAidFund/controller/MedicalMutualAidFundBranchUnionAuditController.java @@ -56,7 +56,7 @@ public class MedicalMutualAidFundBranchUnionAuditController { public Result pageData(PageForm pageForm, @Param(required = false, value = "year") Integer year,Integer isAudit) { Cnd cnd = Cnd.NEW(); cnd.andEX("YEAR(applyDate)", "=", year); - if (!ShiroUtil.hasAnyRoles("sysadmin,A06")) { + if (!ShiroUtil.hasAnyRoles("sysadmin,SchoolUnionAdmin")) { cnd.and("unionId", "=", Vi.getUnionId()); } switch (isAudit) { diff --git a/src/main/java/io/v/nutz/zhgh/member/controller/MemberAgendaController.java b/src/main/java/io/v/nutz/zhgh/member/controller/MemberAgendaController.java index 341b1fe..70d181b 100644 --- a/src/main/java/io/v/nutz/zhgh/member/controller/MemberAgendaController.java +++ b/src/main/java/io/v/nutz/zhgh/member/controller/MemberAgendaController.java @@ -49,10 +49,10 @@ public class MemberAgendaController { final String title = "【会员系统】"; List list = new ArrayList<>(); - if (!ShiroUtil.hasAnyRoles("sysadmin,A06,H04,H03")) { + if (!ShiroUtil.hasAnyRoles("sysadmin,SchoolUnionAdmin,H04,H03")) { return list; } - boolean anyRoles = ShiroUtil.hasAnyRoles("sysadmin,A06,H03"); + boolean anyRoles = ShiroUtil.hasAnyRoles("sysadmin,SchoolUnionAdmin,H03"); // 入会申请 diff --git a/src/main/java/io/v/nutz/zhgh/member/controller/MemberCommonController.java b/src/main/java/io/v/nutz/zhgh/member/controller/MemberCommonController.java index b90f0d4..8413686 100644 --- a/src/main/java/io/v/nutz/zhgh/member/controller/MemberCommonController.java +++ b/src/main/java/io/v/nutz/zhgh/member/controller/MemberCommonController.java @@ -67,7 +67,7 @@ public class MemberCommonController { @ViReturn @Ok("json:{locked:'password|salt',ignoreNull:false}") public Object userInfo(String userId, @Param(value = "source", required = false) String source) { - if (!ShiroUtil.hasAnyRoles("sysadmin,A06,H04,ghxzzz") && !userId.equals(ShiroUtil.getPrincipalProperty("id"))) { + if (!ShiroUtil.hasAnyRoles("sysadmin,SchoolUnionAdmin,H04,ghxzzz") && !userId.equals(ShiroUtil.getPrincipalProperty("id"))) { return Result.error("您没有权限！"); } Sql sql = Sqls.create(""" diff --git a/src/main/java/io/v/nutz/zhgh/member/controller/change/MemberChangeManageController.java b/src/main/java/io/v/nutz/zhgh/member/controller/change/MemberChangeManageController.java index 0445575..73f9209 100644 --- a/src/main/java/io/v/nutz/zhgh/member/controller/change/MemberChangeManageController.java +++ b/src/main/java/io/v/nutz/zhgh/member/controller/change/MemberChangeManageController.java @@ -151,7 +151,7 @@ public class MemberChangeManageController { cnd.and(pageForm); - if (!ShiroUtil.hasAnyRoles("sysadmin,H03,A06")) { + if (!ShiroUtil.hasAnyRoles("sysadmin,H03,SchoolUnionAdmin")) { if (ShiroUtil.hasRole("H04")) { cnd.and("u.unionId", "=", Vi.getUnionId()); } else if (ShiroUtil.hasRole("ghxzzz")) { @@ -254,7 +254,7 @@ public class MemberChangeManageController { cnd.andEX("u.member", "=", isMember); cnd.and(pageForm); - if (!ShiroUtil.hasAnyRoles("sysadmin,H03,A06")) { + if (!ShiroUtil.hasAnyRoles("sysadmin,H03,SchoolUnionAdmin")) { if (ShiroUtil.hasRole("H04")) { cnd.and("u.unionId", "=", Vi.getUnionId()); } else if (ShiroUtil.hasRole("ghxzzz")) { @@ -323,7 +323,7 @@ public class MemberChangeManageController { return Result.success(); // record.setRecordMode(MemberChangeRecordMode.MEMBER.getCode()); -// if (ShiroUtil.hasAnyRoles("sysadmin,A06,H03")) { +// if (ShiroUtil.hasAnyRoles("sysadmin,SchoolUnionAdmin,H03")) { // record.setApplyOrigin(MemberChangeOrigin.SCHOOL.getCode()); // record = MemberChangeAuditHandle.CREATE.next(record, null); // MemberChangeAuditHandle.SCHOOL.next(record, new Audit().setAuditPass(true)); @@ -401,7 +401,7 @@ public class MemberChangeManageController { status.add(MemberStatus.TURN_IN.getCode()); status.add(MemberStatus.RESTORE.getCode()); - if (!ShiroUtil.hasAnyRoles("sysadmin,A06,H03")) { + if (!ShiroUtil.hasAnyRoles("sysadmin,SchoolUnionAdmin,H03")) { cnd.and("unionid", "=", Vi.getUnionId()); } if (StrUtil.isBlank(pageForm.getPageOrderName()) && StrUtil.isBlank(pageForm.getPageOrderBy())) { @@ -487,7 +487,7 @@ public class MemberChangeManageController { cnd.andEX("u.unionid", "=", unionId); // cnd.and("u.member", "=", member); - if (!ShiroUtil.hasAnyRoles("sysadmin,A06,flwyh01")) { + if (!ShiroUtil.hasAnyRoles("sysadmin,SchoolUnionAdmin,flwyh01")) { cnd.and("u.unionid", "=", Vi.getUnionId()); } // for (String s : sqlCnd) { @@ -508,7 +508,7 @@ public class MemberChangeManageController { public Object joinWelfareMember(String[] userIds, String taskId, @Param(value = "threeUnitId", required = false) String threeUnitId, @Param(value = "unitId", required = false) String unitId) { - if (ShiroUtil.hasAnyRoles("sysadmin,A06,flwyh01")) { + if (ShiroUtil.hasAnyRoles("sysadmin,SchoolUnionAdmin,flwyh01")) { UserMode.addMemberRole(userIds); return null; } @@ -591,7 +591,7 @@ public class MemberChangeManageController { entityList.add(new ExcelExportEntity("性别", "sex", 10)); entityList.add(new ExcelExportEntity("单位名称", "unitName", 20)); entityList.add(new ExcelExportEntity("联系方式", "mobile", 20)); - if (ShiroUtil.hasAnyRoles("sysadmin,A06")) { + if (ShiroUtil.hasAnyRoles("sysadmin,SchoolUnionAdmin")) { entityList.add(new ExcelExportEntity("身份证号", "idcard", 30)); } entityList.add(new ExcelExportEntity("在职状态", "userState", 20)); diff --git a/src/main/java/io/v/nutz/zhgh/member/controller/change/MemberChangeRecordsController.java b/src/main/java/io/v/nutz/zhgh/member/controller/change/MemberChangeRecordsController.java index 6d263cf..d87b49d 100644 --- a/src/main/java/io/v/nutz/zhgh/member/controller/change/MemberChangeRecordsController.java +++ b/src/main/java/io/v/nutz/zhgh/member/controller/change/MemberChangeRecordsController.java @@ -74,7 +74,7 @@ public class MemberChangeRecordsController { cnd.andEX("mcr.type", "=", changeType); cnd.andEX("mcr.applyOrigin", "=", applyOrigin); - if (!ShiroUtil.hasAnyRoles("sysadmin,H03,A06")) { + if (!ShiroUtil.hasAnyRoles("sysadmin,H03,SchoolUnionAdmin")) { if (ShiroUtil.hasRole("H04")) { cnd.and("u.unionId", "=", Vi.getUnionId()); } else if (ShiroUtil.hasRole("ghxzzz")) { diff --git a/src/main/java/io/v/nutz/zhgh/member/controller/info/MemberBatchMakeController.java b/src/main/java/io/v/nutz/zhgh/member/controller/info/MemberBatchMakeController.java index a1ba028..483cafa 100644 --- a/src/main/java/io/v/nutz/zhgh/member/controller/info/MemberBatchMakeController.java +++ b/src/main/java/io/v/nutz/zhgh/member/controller/info/MemberBatchMakeController.java @@ -117,7 +117,7 @@ public class MemberBatchMakeController { cnd.andEX("campusName", "=", campus); cnd.andEX("memberStatus", "=", memberStatus); - if (!ShiroUtil.hasAnyRoles("sysadmin,H03,A06")) { + if (!ShiroUtil.hasAnyRoles("sysadmin,H03,SchoolUnionAdmin")) { if (ShiroUtil.hasRole("H04")) { cnd.and("unionId", "=", Vi.getUnionId()); } else if (ShiroUtil.hasRole("ghxzzz")) { @@ -211,7 +211,7 @@ public class MemberBatchMakeController { cnd.andEX("unionGroupId", "=", unionGroupId); cnd.andEX("personType", "=", personType); cnd.andEX("userState", "=", userState); - if (!ShiroUtil.hasAnyRoles("sysadmin,H03,A06")) { + if (!ShiroUtil.hasAnyRoles("sysadmin,H03,SchoolUnionAdmin")) { if (ShiroUtil.hasRole("H04")) { cnd.and("unionId", "=", Vi.getUnionId()); } else if (ShiroUtil.hasRole("ghxzzz")) { diff --git a/src/main/java/io/v/nutz/zhgh/member/controller/info/MemberDataManageController.java b/src/main/java/io/v/nutz/zhgh/member/controller/info/MemberDataManageController.java index cf2103d..58512c8 100644 --- a/src/main/java/io/v/nutz/zhgh/member/controller/info/MemberDataManageController.java +++ b/src/main/java/io/v/nutz/zhgh/member/controller/info/MemberDataManageController.java @@ -145,7 +145,7 @@ public class MemberDataManageController { cnd.and(seg); } - if (!ShiroUtil.hasAnyRoles("sysadmin,A06,H03")) { + if (!ShiroUtil.hasAnyRoles("sysadmin,SchoolUnionAdmin,H03")) { if (ShiroUtil.hasRole("H04")) { cnd.and("unionid", "=", Vi.getUnionId()); } else { @@ -248,7 +248,7 @@ public class MemberDataManageController { cnd.and(seg); } - if (!ShiroUtil.hasAnyRoles("sysadmin,A06,H03")) { + if (!ShiroUtil.hasAnyRoles("sysadmin,SchoolUnionAdmin,H03")) { if (ShiroUtil.hasRole("H04")) { cnd.and("unionid", "=", Vi.getUnionId()); } else { @@ -367,7 +367,7 @@ public class MemberDataManageController { cnd.and(seg); } - if (!ShiroUtil.hasAnyRoles("sysadmin,A06,H03")) { + if (!ShiroUtil.hasAnyRoles("sysadmin,SchoolUnionAdmin,H03")) { if (ShiroUtil.hasRole("H04")) { cnd.and("unionid", "=", Vi.getUnionId()); } else { diff --git a/src/main/java/io/v/nutz/zhgh/member/controller/info/MemberGroupInfoController.java b/src/main/java/io/v/nutz/zhgh/member/controller/info/MemberGroupInfoController.java index 427a041..d3955f4 100644 --- a/src/main/java/io/v/nutz/zhgh/member/controller/info/MemberGroupInfoController.java +++ b/src/main/java/io/v/nutz/zhgh/member/controller/info/MemberGroupInfoController.java @@ -153,7 +153,7 @@ public class MemberGroupInfoController { cnd.where().andLike("jobTitle", jobTitle); } - if (!ShiroUtil.hasAnyRoles("sysadmin,H03,A06")) { + if (!ShiroUtil.hasAnyRoles("sysadmin,H03,SchoolUnionAdmin")) { if (ShiroUtil.hasRole("H04")) { cnd.and("unionId", "=", Vi.getUnionId()); } else if (ShiroUtil.hasRole("ghxzzz")) { diff --git a/src/main/java/io/v/nutz/zhgh/member/controller/info/MemberMakeController.java b/src/main/java/io/v/nutz/zhgh/member/controller/info/MemberMakeController.java index bba61f8..dacbea2 100644 --- a/src/main/java/io/v/nutz/zhgh/member/controller/info/MemberMakeController.java +++ b/src/main/java/io/v/nutz/zhgh/member/controller/info/MemberMakeController.java @@ -128,7 +128,7 @@ public class MemberMakeController { cnd.andEX("memberStatus", "=", memberStatus); } - if (!ShiroUtil.hasAnyRoles("sysadmin,A06,H03")) { + if (!ShiroUtil.hasAnyRoles("sysadmin,SchoolUnionAdmin,H03")) { if (ShiroUtil.hasRole("H04")) { cnd.and("unionid", "=", Vi.getUnionId()); } else { @@ -168,7 +168,7 @@ public class MemberMakeController { record.setCurrentUnitId(sys_user.getUnitid()); record.setCurrentUnionId(sys_user.getUnionid()); record.setApplyTime(new Date()); - if (ShiroUtil.hasAnyRoles("sysadmin,A06,H03")) { + if (ShiroUtil.hasAnyRoles("sysadmin,SchoolUnionAdmin,H03")) { record.setApplyOrigin(MemberChangeOrigin.SCHOOL.getCode()); } else if (ShiroUtil.hasAnyRoles("H04")) { record.setApplyOrigin(MemberChangeOrigin.UNION.getCode()); diff --git a/src/main/java/io/v/nutz/zhgh/member/controller/inquire/MemberAnalysisController.java b/src/main/java/io/v/nutz/zhgh/member/controller/inquire/MemberAnalysisController.java index e3751df..635bdde 100644 --- a/src/main/java/io/v/nutz/zhgh/member/controller/inquire/MemberAnalysisController.java +++ b/src/main/java/io/v/nutz/zhgh/member/controller/inquire/MemberAnalysisController.java @@ -82,7 +82,7 @@ public class MemberAnalysisController { $condition """); Cnd cnd = Cnd.NEW(); - if (!ShiroUtil.hasAnyRoles(Lang.array("sysadmin", "A06", "H03"))) { + if (!ShiroUtil.hasAnyRoles(Lang.array("sysadmin", "SchoolUnionAdmin", "H03"))) { cnd.and("gh.id", "=", Vi.getUnionId()); } cnd.asc("gh.unioncode"); @@ -157,7 +157,7 @@ public class MemberAnalysisController { // cnd.and("dw.parentId", "=", 0).and("id", "not in", Lang.array("0", "000")); // cnd.and("dw.parentId", "=", 0); cnd.asc("dw.unitcode"); - if (!ShiroUtil.hasAnyRoles(Lang.array("sysadmin", "A06", "H03"))) { + if (!ShiroUtil.hasAnyRoles(Lang.array("sysadmin", "SchoolUnionAdmin", "H03"))) { cnd.and("dw.unionid", "=", Vi.getUnionId()); } sql.setCondition(cnd); @@ -275,7 +275,7 @@ public class MemberAnalysisController { if (Strings.isNotBlank(unitId)) { cnd.and("dw.id", "=", unitId); } - if (!ShiroUtil.hasAnyRoles(Lang.array("sysadmin", "A06", "H03"))) { + if (!ShiroUtil.hasAnyRoles(Lang.array("sysadmin", "SchoolUnionAdmin", "H03"))) { cnd.and("dw.unionid", "=", Vi.getUnionId()); } // cnd.and("dw.parentId", "=", 0).and("dw.id", "not in ", Lang.array("0", "000")); @@ -285,7 +285,7 @@ public class MemberAnalysisController { if (Strings.isNotBlank(unionId)) { cnd.and("gh.id", "=", unionId); } - if (!ShiroUtil.hasAnyRoles(Lang.array("sysadmin", "A06", "H03"))) { + if (!ShiroUtil.hasAnyRoles(Lang.array("sysadmin", "SchoolUnionAdmin", "H03"))) { cnd.and("gh.id", "=", Vi.getUnionId()); } cnd.asc("gh.unioncode"); diff --git a/src/main/java/io/v/nutz/zhgh/member/controller/inquire/MemberHistoyController.java b/src/main/java/io/v/nutz/zhgh/member/controller/inquire/MemberHistoyController.java index 3d1d47f..3b25f5b 100644 --- a/src/main/java/io/v/nutz/zhgh/member/controller/inquire/MemberHistoyController.java +++ b/src/main/java/io/v/nutz/zhgh/member/controller/inquire/MemberHistoyController.java @@ -63,7 +63,7 @@ public class MemberHistoyController { """); CndPlus cnd = CndPlus.create(); - if (!ShiroUtil.hasAnyRoles("sysadmin,H03,A06")) { + if (!ShiroUtil.hasAnyRoles("sysadmin,H03,SchoolUnionAdmin")) { if (ShiroUtil.hasRole("H04")) { cnd.and("u.unionId", "=", Vi.getUnionId()); } else if (ShiroUtil.hasRole("ghxzzz")) { diff --git a/src/main/java/io/v/nutz/zhgh/member/controller/inquire/MemberInquireIntegrateController.java b/src/main/java/io/v/nutz/zhgh/member/controller/inquire/MemberInquireIntegrateController.java index 235b768..23a706f 100644 --- a/src/main/java/io/v/nutz/zhgh/member/controller/inquire/MemberInquireIntegrateController.java +++ b/src/main/java/io/v/nutz/zhgh/member/controller/inquire/MemberInquireIntegrateController.java @@ -143,7 +143,7 @@ public class MemberInquireIntegrateController { cnd.and(Cnd.exps("u.member","=",0).or("u.member","is",null).or("u.member","=","")); } - if (!ShiroUtil.hasAnyRoles("sysadmin,A06,H03")) { + if (!ShiroUtil.hasAnyRoles("sysadmin,SchoolUnionAdmin,H03")) { if (ShiroUtil.hasAnyRoles("H04,gh01")) { cnd.and("u.unionId", "=", Vi.getUnionId()); } else if (ShiroUtil.hasRole("ghxzzz")) { @@ -493,7 +493,7 @@ public class MemberInquireIntegrateController { cnd.and(Cnd.exps("u.member","=",0).or("u.member","is",null).or("u.member","=","")); } - if (!ShiroUtil.hasAnyRoles("sysadmin,A06,H03")) { + if (!ShiroUtil.hasAnyRoles("sysadmin,SchoolUnionAdmin,H03")) { cnd.and("unionid", "=", Vi.getUnionId()); } cnd.asc("unitcode"); diff --git a/src/main/java/io/v/nutz/zhgh/member/controller/inquire/MemberStatisticsController.java b/src/main/java/io/v/nutz/zhgh/member/controller/inquire/MemberStatisticsController.java index e79d738..072eef1 100644 --- a/src/main/java/io/v/nutz/zhgh/member/controller/inquire/MemberStatisticsController.java +++ b/src/main/java/io/v/nutz/zhgh/member/controller/inquire/MemberStatisticsController.java @@ -89,7 +89,7 @@ public class MemberStatisticsController { int currentYear = Calendar.getInstance().get(Calendar.YEAR); CndPlus cnd = CndPlus.create(); Sql sql = Sqls.create(unionSql); - if (!ShiroUtil.hasAnyRoles(Lang.array("sysadmin", "A06", "H03"))) { + if (!ShiroUtil.hasAnyRoles(Lang.array("sysadmin", "SchoolUnionAdmin", "H03"))) { cnd.and("un.id", "=", Vi.getUnionId()); } if(StrUtil.isNotBlank(unionId)) { @@ -113,7 +113,7 @@ public class MemberStatisticsController { int currentYear = Calendar.getInstance().get(Calendar.YEAR); CndPlus cnd = CndPlus.create(); Sql sql = Sqls.create(unitSql); - if (!ShiroUtil.hasAnyRoles(Lang.array("sysadmin", "A06", "H03"))) { + if (!ShiroUtil.hasAnyRoles(Lang.array("sysadmin", "SchoolUnionAdmin", "H03"))) { cnd.and("un.unionid", "=", Vi.getUnionId()); } cnd.and("unitlevel", "=", 2).and("unitcode", "!=", "000"); @@ -153,7 +153,7 @@ public class MemberStatisticsController { sys_union un $condition """); - if (!ShiroUtil.hasAnyRoles(Lang.array("sysadmin", "A06", "H03"))) { + if (!ShiroUtil.hasAnyRoles(Lang.array("sysadmin", "SchoolUnionAdmin", "H03"))) { cndPlus.and("un.id", "=", Vi.getUnionId()); } else { cndPlus.andEX("un.id", "=", unionId); @@ -178,7 +178,7 @@ public class MemberStatisticsController { Sql sql = Sqls.create(union ? unionSql : unitSql); if (union) { - if (!ShiroUtil.hasAnyRoles(Lang.array("sysadmin", "A06", "H03"))) { + if (!ShiroUtil.hasAnyRoles(Lang.array("sysadmin", "SchoolUnionAdmin", "H03"))) { cndPlus.and("un.id", "=", Vi.getUnionId()); } if (Strings.isNotBlank(unionId)) { @@ -186,7 +186,7 @@ public class MemberStatisticsController { } } else { cndPlus.and("unitlevel", "=", 2).and("unitcode", "!=", "000"); - if (!ShiroUtil.hasAnyRoles(Lang.array("sysadmin", "A06", "H03"))) { + if (!ShiroUtil.hasAnyRoles(Lang.array("sysadmin", "SchoolUnionAdmin", "H03"))) { cndPlus.and("un.unionid", "=", Vi.getUnionId()); } if (Strings.isNotBlank(unitId)) { diff --git a/src/main/java/io/v/nutz/zhgh/member/controller/inquire/MemberUserTypeController.java b/src/main/java/io/v/nutz/zhgh/member/controller/inquire/MemberUserTypeController.java index 31ec515..9f4738a 100644 --- a/src/main/java/io/v/nutz/zhgh/member/controller/inquire/MemberUserTypeController.java +++ b/src/main/java/io/v/nutz/zhgh/member/controller/inquire/MemberUserTypeController.java @@ -53,7 +53,7 @@ public class MemberUserTypeController { Sql sql = null; - if (ShiroUtil.hasAnyRoles(Lang.array("sysadmin", "A06", "H03"))) { + if (ShiroUtil.hasAnyRoles(Lang.array("sysadmin", "SchoolUnionAdmin", "H03"))) { if (searchType.equals("按基层工会统计")) { sql = Sqls.create(""" SELECT @@ -134,7 +134,7 @@ public class MemberUserTypeController { personTypes = userType.stream().map(v -> v.getName()).collect(Collectors.toList()); Sql sql = null; - boolean hasAdminRoles = ShiroUtil.hasAnyRoles(Lang.array("sysadmin", "A06", "H03")); + boolean hasAdminRoles = ShiroUtil.hasAnyRoles(Lang.array("sysadmin", "SchoolUnionAdmin", "H03")); if (hasAdminRoles) { if (searchType.equals("按基层工会统计")) { diff --git a/src/main/java/io/v/nutz/zhgh/memberCost/controller/MemberPaymentSummaryController.java b/src/main/java/io/v/nutz/zhgh/memberCost/controller/MemberPaymentSummaryController.java index d7e61c9..e64793f 100644 --- a/src/main/java/io/v/nutz/zhgh/memberCost/controller/MemberPaymentSummaryController.java +++ b/src/main/java/io/v/nutz/zhgh/memberCost/controller/MemberPaymentSummaryController.java @@ -110,7 +110,7 @@ public class MemberPaymentSummaryController { if (StrUtil.isNotBlank(searchName) && StrUtil.isNotBlank(searchKeyword)) { cnd.and(Cnd.likeEX(searchName, searchKeyword)); } - if (!ShiroUtil.hasAnyRoles("sysadmin,A06,H04")) { + if (!ShiroUtil.hasAnyRoles("sysadmin,SchoolUnionAdmin,H04")) { if (ShiroUtil.hasRole("H04")) { cnd.and("u.unionid", "=", Vi.getUnionId()); } else { diff --git a/src/main/java/io/v/nutz/zhgh/mobile/activity/site/SiteAuditMobileController.java b/src/main/java/io/v/nutz/zhgh/mobile/activity/site/SiteAuditMobileController.java index 04251cf..3437ee5 100644 --- a/src/main/java/io/v/nutz/zhgh/mobile/activity/site/SiteAuditMobileController.java +++ b/src/main/java/io/v/nutz/zhgh/mobile/activity/site/SiteAuditMobileController.java @@ -150,7 +150,7 @@ public class SiteAuditMobileController { cnd.and("ar.reserve_state", "in", Sqls.createf("SELECT stateId FROM audit_state_user WHERE userid = '%s'", ShiroUtil.getPrincipalProperty("id"))); cnd.and("state.stateAuditType", "in", Lang.list(AuditTypeEnum.AUDIT.getValue())); - /*if(!ShiroUtil.hasAnyRoles(new String[]{"xghng","A06","sysadmin"})) { + /*if(!ShiroUtil.hasAnyRoles(new String[]{"xghng","SchoolUnionAdmin","sysadmin"})) { if (ShiroUtil.hasAnyRoles(new String[]{"gh10"})) { Sys_user user = (Sys_user) ShiroUtil.getPrincipal(); cnd.and("u.unitid", "=", user.getUnitid()); diff --git a/src/main/java/io/v/nutz/zhgh/mobile/activity/unionActivity/UnionActivityRegisterController.java b/src/main/java/io/v/nutz/zhgh/mobile/activity/unionActivity/UnionActivityRegisterController.java index 252035f..abbad5e 100644 --- a/src/main/java/io/v/nutz/zhgh/mobile/activity/unionActivity/UnionActivityRegisterController.java +++ b/src/main/java/io/v/nutz/zhgh/mobile/activity/unionActivity/UnionActivityRegisterController.java @@ -165,7 +165,7 @@ public class UnionActivityRegisterController { allCnd.andEX("signUpMethod", "is not", null); allCnd.andEX("state", "=", 3); allCnd.and(new Static("(SELECT COUNT(1) FROM activity_user_scope WHERE groupId= ti.groupId AND userId='%s') >0".formatted(ShiroUtil.getUserId()))); - if (!ShiroUtil.hasAnyRoles(Lang.list("sysadmin", "A06"))) { + if (!ShiroUtil.hasAnyRoles(Lang.list("sysadmin", "SchoolUnionAdmin"))) { if (ShiroUtil.hasRole("H04")) { allCnd.andEX("signUpMethod", "in", Lang.array(1, 2, 3)); } else { @@ -211,7 +211,7 @@ public class UnionActivityRegisterController { // unionExps.and("YEAR(act.startTime)", "=", year); unionExps.and("act.projectTypeCode", "!=", "50004"); unionExps.and("act.signUpMethod", "is not", null); - if (!ShiroUtil.hasAnyRoles(Lang.list("sysadmin", "A06"))) { + if (!ShiroUtil.hasAnyRoles(Lang.list("sysadmin", "SchoolUnionAdmin"))) { if (ShiroUtil.hasRole("H04")) { unionExps.and("act.signUpMethod", "in", Lang.array(1, 2)); } else { diff --git a/src/main/java/io/v/nutz/zhgh/mobile/condolence/CondolenceAuditControll.java b/src/main/java/io/v/nutz/zhgh/mobile/condolence/CondolenceAuditControll.java index 4833e08..4f6a91b 100644 --- a/src/main/java/io/v/nutz/zhgh/mobile/condolence/CondolenceAuditControll.java +++ b/src/main/java/io/v/nutz/zhgh/mobile/condolence/CondolenceAuditControll.java @@ -67,7 +67,7 @@ public class CondolenceAuditControll { if (!ShiroUtil.hasAnyRoles("sysadmin")) { SqlExpressionGroup group = new SqlExpressionGroup(); - if (ShiroUtil.hasAnyRoles("A06")) { + if (ShiroUtil.hasAnyRoles("SchoolUnionAdmin")) { group.or(Cnd.exps("con.state_id", isAudit ? ">" : "=", 2020).or("con.state_id", isAudit ? ">" : "=", 2000)); // cnd.and("con.state_id", isAudit ? ">" : "=", 2020); } @@ -108,11 +108,11 @@ public class CondolenceAuditControll { @At("/auditHtml") @Ok("re") public String auditHtml(Integer state_id) { - if (state_id == 2000 && ShiroUtil.hasAnyRoles("H04,A06,sysadmin")) { + if (state_id == 2000 && ShiroUtil.hasAnyRoles("H04,SchoolUnionAdmin,sysadmin")) { return "beetl:/mobile/condolence/union_Audit.html"; } else if (state_id == 2012 && ShiroUtil.hasAnyRoles("gh03,SchoolUnionAccountant,sysadmin")) { return "beetl:/mobile/condolence/fr_Audit.html"; - } else if (state_id == 2020 && ShiroUtil.hasAnyRoles("A06,sysadmin")) { + } else if (state_id == 2020 && ShiroUtil.hasAnyRoles("SchoolUnionAdmin,sysadmin")) { return "beetl:/mobile/condolence/school_Audit.html"; } return "beetl:/mobile/condolence/apply_info.html"; diff --git a/src/main/java/io/v/nutz/zhgh/mobile/difficulty/MDifficultyAuditController.java b/src/main/java/io/v/nutz/zhgh/mobile/difficulty/MDifficultyAuditController.java index e91ecc2..77f3771 100644 --- a/src/main/java/io/v/nutz/zhgh/mobile/difficulty/MDifficultyAuditController.java +++ b/src/main/java/io/v/nutz/zhgh/mobile/difficulty/MDifficultyAuditController.java @@ -38,7 +38,7 @@ public class MDifficultyAuditController { public Object pageData(Boolean isAudit, Integer year, String unitId, String unionId, PageForm page) { CndPlus cnd = CndPlus.create(); if (!ShiroUtil.hasAnyRoles("sysadmin")) { - if (ShiroUtil.hasAnyRoles("A06")) { + if (ShiroUtil.hasAnyRoles("SchoolUnionAdmin")) { cnd.and("sq.zt", isAudit ? ">" : "=", 200); } else if (ShiroUtil.hasAnyRoles("H04")) { @@ -55,9 +55,9 @@ public class MDifficultyAuditController { @At("/auditHtml") @Ok("re") public String auditHtml(Integer zt) { - if (zt == 100 && ShiroUtil.hasAnyRoles("H04,A06,sysadmin")) { + if (zt == 100 && ShiroUtil.hasAnyRoles("H04,SchoolUnionAdmin,sysadmin")) { return "beetl:/mobile/difficulty/union_Audit.html"; - } else if (zt == 200 && ShiroUtil.hasAnyRoles("A06,sysadmin")) { + } else if (zt == 200 && ShiroUtil.hasAnyRoles("SchoolUnionAdmin,sysadmin")) { return "beetl:/mobile/difficulty/school_Audit.html"; } return "beetl:/mobile/difficulty/apply_info.html"; diff --git a/src/main/java/io/v/nutz/zhgh/mobile/member/MemberAuditUnionController.java b/src/main/java/io/v/nutz/zhgh/mobile/member/MemberAuditUnionController.java index c18a6af..8a05765 100644 --- a/src/main/java/io/v/nutz/zhgh/mobile/member/MemberAuditUnionController.java +++ b/src/main/java/io/v/nutz/zhgh/mobile/member/MemberAuditUnionController.java @@ -59,12 +59,12 @@ public class MemberAuditUnionController { if (ShiroUtil.hasAnyRoles("sysadmin")) { cnd.and("mar.stateId", "in", isAudit ? Lang.array(MemberApplyState.UNION_FAIL, MemberApplyState.SCHOOL_UNION_FAIL, MemberApplyState.NORMAL_MEMBER) : Lang.array(MemberApplyState.UNION, MemberApplyState.SCHOOL_UNION)); } else { - if (ShiroUtil.hasAnyRoles("A06,wyh02") && ShiroUtil.hasAnyRoles("H04")) { + if (ShiroUtil.hasAnyRoles("SchoolUnionAdmin,wyh02") && ShiroUtil.hasAnyRoles("H04")) { SqlExpressionGroup seg = new SqlExpressionGroup(); seg.or("mar.stateId", isAudit ? ">" : "=", MemberApplyState.SCHOOL_UNION); seg.or(CndPlus.exps("mar.unionId", "=", Vi.getUnionId()).and("mar.stateId", isAudit ? ">" : "=", MemberApplyState.UNION)); cnd.and(seg); - } else if (ShiroUtil.hasAnyRoles("A06,wyh02")) { + } else if (ShiroUtil.hasAnyRoles("SchoolUnionAdmin,wyh02")) { cnd.and("mar.stateId", isAudit ? ">" : "=", MemberApplyState.SCHOOL_UNION); } else if (ShiroUtil.hasAnyRoles("H04")) { cnd.and("mar.unionId", "=", Vi.getUnionId()); @@ -72,7 +72,7 @@ public class MemberAuditUnionController { } - /*if (ShiroUtil.hasAnyRoles("A06,wyh02")) { + /*if (ShiroUtil.hasAnyRoles("SchoolUnionAdmin,wyh02")) { cnd.and("mar.stateId", isAudit ? ">" : "=", MemberApplyState.SCHOOL_UNION); } else if (ShiroUtil.hasAnyRoles("H04")) { cnd.and("mar.unionId", "=", Vi.getUnionId()); @@ -81,7 +81,7 @@ public class MemberAuditUnionController { } /* if (!ShiroUtil.hasAnyRoles("sysadmin")) { - if (ShiroUtil.hasAnyRoles("A06,wyh02")) { + if (ShiroUtil.hasAnyRoles("SchoolUnionAdmin,wyh02")) { cnd.and("mar.stateId", isAudit ? ">" : "=", MemberApplyState.SCHOOL_UNION); } }*/ @@ -98,9 +98,9 @@ public class MemberAuditUnionController { @At("/findOne") @Ok("re") public String findOne(Integer stateId) { - if (stateId == MemberApplyState.UNION && ShiroUtil.hasAnyRoles("H04,A06,sysadmin")) { + if (stateId == MemberApplyState.UNION && ShiroUtil.hasAnyRoles("H04,SchoolUnionAdmin,sysadmin")) { return "beetl:/mobile/member/union_Audit.html"; - } else if (stateId == MemberApplyState.SCHOOL_UNION && ShiroUtil.hasAnyRoles("A06,sysadmin")) { + } else if (stateId == MemberApplyState.SCHOOL_UNION && ShiroUtil.hasAnyRoles("SchoolUnionAdmin,sysadmin")) { return "beetl:/mobile/member/school_Audit.html"; } /*else if (stateId == MemberApplyState.NORMAL_MEMBER || stateId == MemberApplyState.UNION_FAIL || stateId == MemberApplyState.SCHOOL_UNION_FAIL) { return "beetl:/mobile/member/detail.html"; diff --git a/src/main/java/io/v/nutz/zhgh/mobile/member/MemberMobileController.java b/src/main/java/io/v/nutz/zhgh/mobile/member/MemberMobileController.java index 3180d8b..cca8aa7 100644 --- a/src/main/java/io/v/nutz/zhgh/mobile/member/MemberMobileController.java +++ b/src/main/java/io/v/nutz/zhgh/mobile/member/MemberMobileController.java @@ -70,7 +70,7 @@ public class MemberMobileController { @At("/query") @Ok("beetl:/mobile/member/query.html") - @RequiresRoles(value = {"H04", "A06", "sysadmin"}, logical = Logical.OR) + @RequiresRoles(value = {"H04", "SchoolUnionAdmin", "sysadmin"}, logical = Logical.OR) public void query() { } @@ -88,7 +88,7 @@ public class MemberMobileController { @At @ViReturn - @RequiresRoles(value = {"H04", "A06", "sysadmin"}, logical = Logical.OR) + @RequiresRoles(value = {"H04", "SchoolUnionAdmin", "sysadmin"}, logical = Logical.OR) public Object getMemberData(PageForm pageForm, String unionId, String unitId) { Sql sql = Sqls.create(""" SELECT @@ -119,7 +119,7 @@ public class MemberMobileController { @At @ViReturn - @RequiresRoles(value = {"H04", "A06", "sysadmin"}, logical = Logical.OR) + @RequiresRoles(value = {"H04", "SchoolUnionAdmin", "sysadmin"}, logical = Logical.OR) public Object viewInfo(String id) { Sql sql = Sqls.create(""" SELECT diff --git a/src/main/java/io/v/nutz/zhgh/mobile/selfApplyUser/controller/MApplyUserAuditController.java b/src/main/java/io/v/nutz/zhgh/mobile/selfApplyUser/controller/MApplyUserAuditController.java index cf37fa0..8e95289 100644 --- a/src/main/java/io/v/nutz/zhgh/mobile/selfApplyUser/controller/MApplyUserAuditController.java +++ b/src/main/java/io/v/nutz/zhgh/mobile/selfApplyUser/controller/MApplyUserAuditController.java @@ -48,14 +48,14 @@ public class MApplyUserAuditController { private MsgApi msgApi; @At("") - @RequiresRoles(value = {"sysadmin", "A06"}, logical = Logical.OR) + @RequiresRoles(value = {"sysadmin", "SchoolUnionAdmin"}, logical = Logical.OR) @Ok("beetl:/mobile/selfApplyUser/applyUserAudit.html") public void index() { } @At @ViReturn - @RequiresRoles(value = {"sysadmin", "A06"}, logical = Logical.OR) + @RequiresRoles(value = {"sysadmin", "SchoolUnionAdmin"}, logical = Logical.OR) public Object pageData(PageForm page, @Param(value = "timeSwitch", required = false) Boolean timeSwitch, @Param(value = "time", required = false) String time, @Param(value = "auditState", required = false) Integer auditState) { @@ -83,7 +83,7 @@ public class MApplyUserAuditController { @At @ViReturn @Aop(TransAop.READ_COMMITTED) - @RequiresRoles(value = {"sysadmin", "A06"}, logical = Logical.OR) + @RequiresRoles(value = {"sysadmin", "SchoolUnionAdmin"}, logical = Logical.OR) public Object doDelete(String id) { baseService.dao().delete(SelfApplyUser.class, id); return null; @@ -93,7 +93,7 @@ public class MApplyUserAuditController { @At @ViReturn @Aop(TransAop.READ_COMMITTED) - @RequiresRoles(value = {"sysadmin", "A06"}, logical = Logical.OR) + @RequiresRoles(value = {"sysadmin", "SchoolUnionAdmin"}, logical = Logical.OR) public Object doSubmit(SelfApplyUser selfApplyUser, Boolean checked) { selfApplyUser.setAuditState(checked ? 3 : 2); selfApplyUser.setAuditTime(DateUtil.now()); diff --git a/src/main/java/io/v/nutz/zhgh/offerAdvice/controller/OfferAdviceMineController.java b/src/main/java/io/v/nutz/zhgh/offerAdvice/controller/OfferAdviceMineController.java index 9d83a50..a3a261d 100644 --- a/src/main/java/io/v/nutz/zhgh/offerAdvice/controller/OfferAdviceMineController.java +++ b/src/main/java/io/v/nutz/zhgh/offerAdvice/controller/OfferAdviceMineController.java @@ -69,7 +69,7 @@ public class OfferAdviceMineController { $condition """); Cnd cnd = Cnd.NEW(); - if (!ShiroUtil.hasAnyRoles("sysadmin,A06")) { + if (!ShiroUtil.hasAnyRoles("sysadmin,SchoolUnionAdmin")) { cnd.and("createUserId", "=", ShiroUtil.getPrincipalProperty("id")); } cnd.andEX("YEAR(createTime)", "=", year); diff --git a/src/main/java/io/v/nutz/zhgh/projectfunding/controller/cxtj/ProjectFundingQueryController.java b/src/main/java/io/v/nutz/zhgh/projectfunding/controller/cxtj/ProjectFundingQueryController.java index ac86c3e..53a27a3 100644 --- a/src/main/java/io/v/nutz/zhgh/projectfunding/controller/cxtj/ProjectFundingQueryController.java +++ b/src/main/java/io/v/nutz/zhgh/projectfunding/controller/cxtj/ProjectFundingQueryController.java @@ -95,7 +95,7 @@ public class ProjectFundingQueryController { $condition """); CndPlus cnd = CndPlus.create(); - if (!ShiroUtil.hasAnyRoles("sysadmin, A06")) { + if (!ShiroUtil.hasAnyRoles("sysadmin, SchoolUnionAdmin")) { cnd.and("pfi.unionId", "=", ShiroUtil.getPrincipalProperty("unionid")); } cnd.andEX("YEAR(pfi.auditTime)", "=", year); diff --git a/src/main/java/io/v/nutz/zhgh/projectfunding/controller/info/ProjectFundingXghAuditController.java b/src/main/java/io/v/nutz/zhgh/projectfunding/controller/info/ProjectFundingXghAuditController.java index 985fbb3..89df8f8 100644 --- a/src/main/java/io/v/nutz/zhgh/projectfunding/controller/info/ProjectFundingXghAuditController.java +++ b/src/main/java/io/v/nutz/zhgh/projectfunding/controller/info/ProjectFundingXghAuditController.java @@ -65,7 +65,7 @@ public class ProjectFundingXghAuditController { $condition """); CndPlus cnd = CndPlus.create(); - if (!ShiroUtil.hasAnyRoles("sysadmin,A06")) { + if (!ShiroUtil.hasAnyRoles("sysadmin,SchoolUnionAdmin")) { cnd.and("pfi.unionId", "=", ShiroUtil.getPrincipalProperty("unionid")); } cnd.andEX("YEAR(pfi.auditTime)","=",year); diff --git a/src/main/java/io/v/nutz/zhgh/proposal/controller/common/ProposalAgentController.java b/src/main/java/io/v/nutz/zhgh/proposal/controller/common/ProposalAgentController.java index 34d284a..244488e 100644 --- a/src/main/java/io/v/nutz/zhgh/proposal/controller/common/ProposalAgentController.java +++ b/src/main/java/io/v/nutz/zhgh/proposal/controller/common/ProposalAgentController.java @@ -217,7 +217,7 @@ public class ProposalAgentController { LEFT JOIN jdh_jdhxx jdh ON jdh.id = info.teacherMeetingId $condition """); - if (!ShiroUtil.hasAnyRoles("sysadmin, tamange,A06")) { + if (!ShiroUtil.hasAnyRoles("sysadmin, tamange,SchoolUnionAdmin")) { if (ShiroUtil.hasAnyRoles("T04")) { List userRoles = proposalInfoService.dao().query(Sys_user_role.class, Cnd.where("userId", "=", ShiroUtil.getUserId()).and("roleId", "=", Roles.IN_CHARGE_LEADER)); List collect = userRoles.stream().filter(v -> StrUtil.isNotBlank(v.getCbdwid())).map(Sys_user_role::getCbdwid).collect(Collectors.toList()); @@ -289,7 +289,7 @@ public class ProposalAgentController { } cnd.and("info.stateCode", "=", ProposalState.UNITREPLY); - if (!ShiroUtil.hasAnyRoles("sysadmin, tamange,A06")) { + if (!ShiroUtil.hasAnyRoles("sysadmin, tamange,SchoolUnionAdmin")) { if (ShiroUtil.hasAnyRoles("T01")) { List userRoles = proposalInfoService.dao().query(Sys_user_role.class, Cnd.where("userId", "=", ShiroUtil.getUserId()).and("roleId", "=", Roles.CONTRACTOR_PERSON)); cnd.and("pr.replyUnitId", "IN", userRoles.stream().filter(v -> StrUtil.isNotBlank(v.getCbdwid())).map(Sys_user_role::getCbdwid).collect(Collectors.toList())); diff --git a/src/main/java/io/v/nutz/zhgh/proposal/controller/export/ProposalExportCaseController.java b/src/main/java/io/v/nutz/zhgh/proposal/controller/export/ProposalExportCaseController.java index 6162276..4b86fa9 100644 --- a/src/main/java/io/v/nutz/zhgh/proposal/controller/export/ProposalExportCaseController.java +++ b/src/main/java/io/v/nutz/zhgh/proposal/controller/export/ProposalExportCaseController.java @@ -115,7 +115,7 @@ public class ProposalExportCaseController { } cnd.andEX("info.stateCode", "=", stateCode); cnd.and("info.stateCode", ">", ProposalState.CASE); - if (!ShiroUtil.hasAnyRoles(new String[]{"sysadmin", "A06", "tamange", "jdhdbt01"})) { + if (!ShiroUtil.hasAnyRoles(new String[]{"sysadmin", "SchoolUnionAdmin", "tamange", "jdhdbt01"})) { if (ShiroUtil.hasRole("H04")) { cnd.and("su.unionid", " in ", vi.getMangeUnionStr()); } @@ -162,7 +162,7 @@ public class ProposalExportCaseController { cnd.andEX("info.stateCode", "=", stateCode); cnd.and("info.stateCode", ">", ProposalState.CASE); - if (!ShiroUtil.hasAnyRoles(new String[]{"sysadmin", "A06", "tamange", "jdhdbt01"})) { + if (!ShiroUtil.hasAnyRoles(new String[]{"sysadmin", "SchoolUnionAdmin", "tamange", "jdhdbt01"})) { if (ShiroUtil.hasRole("H04")) { cnd.and("su.unionid", " in ", vi.getMangeUnionStr()); } diff --git a/src/main/java/io/v/nutz/zhgh/proposal/controller/export/ProposalExportSingleController.java b/src/main/java/io/v/nutz/zhgh/proposal/controller/export/ProposalExportSingleController.java index 6f63d58..b4e2a9f 100644 --- a/src/main/java/io/v/nutz/zhgh/proposal/controller/export/ProposalExportSingleController.java +++ b/src/main/java/io/v/nutz/zhgh/proposal/controller/export/ProposalExportSingleController.java @@ -99,7 +99,7 @@ public class ProposalExportSingleController { if (StrUtil.isNotBlank(undertakeId)) { cnd.and(Cnd.exps("zbpr.replyUnitId", "=", undertakeId).or("xbpr.replyUnitId", "=", undertakeId)); } - if (!ShiroUtil.hasAnyRoles(new String[]{"sysadmin", "A06", "tamange", "jdhdbt01"})) { + if (!ShiroUtil.hasAnyRoles(new String[]{"sysadmin", "SchoolUnionAdmin", "tamange", "jdhdbt01"})) { if (ShiroUtil.hasRole("H04")) { cnd.and("su.unionid", " in ", vi.getMangeUnionStr()); } diff --git a/src/main/java/io/v/nutz/zhgh/proposal/controller/export/ProposalExportSummaryController.java b/src/main/java/io/v/nutz/zhgh/proposal/controller/export/ProposalExportSummaryController.java index 300d172..aa42339 100644 --- a/src/main/java/io/v/nutz/zhgh/proposal/controller/export/ProposalExportSummaryController.java +++ b/src/main/java/io/v/nutz/zhgh/proposal/controller/export/ProposalExportSummaryController.java @@ -106,7 +106,7 @@ public class ProposalExportSummaryController { if (StrUtil.isNotBlank(undertakeId)) { cnd.and(Cnd.exps("masterPr.replyUnitId", "=", undertakeId).or("slavePr.replyUnitId", "=", undertakeId)); } - if (!ShiroUtil.hasAnyRoles(new String[]{"sysadmin", "A06", "tamange", "jdhdbt01"})) { + if (!ShiroUtil.hasAnyRoles(new String[]{"sysadmin", "SchoolUnionAdmin", "tamange", "jdhdbt01"})) { if (ShiroUtil.hasRole("H04")) { cnd.and("su.unionid", " in ", vi.getMangeUnionStr()); } diff --git a/src/main/java/io/v/nutz/zhgh/proposal/controller/export/ProposalExportWholeController.java b/src/main/java/io/v/nutz/zhgh/proposal/controller/export/ProposalExportWholeController.java index 1bdf5a7..6725308 100644 --- a/src/main/java/io/v/nutz/zhgh/proposal/controller/export/ProposalExportWholeController.java +++ b/src/main/java/io/v/nutz/zhgh/proposal/controller/export/ProposalExportWholeController.java @@ -101,7 +101,7 @@ public class ProposalExportWholeController { if (StrUtil.isNotBlank(undertakeId)) { cnd.and(Cnd.exps("zbpr.replyUnitId", "=", undertakeId).or("xbpr.replyUnitId", "=", undertakeId)); } - if (!ShiroUtil.hasAnyRoles(new String[]{"sysadmin", "A06", "tamange", "jdhdbt01"})) { + if (!ShiroUtil.hasAnyRoles(new String[]{"sysadmin", "SchoolUnionAdmin", "tamange", "jdhdbt01"})) { if (ShiroUtil.hasRole("H04")) { cnd.and("su.unionid", " in ", vi.getMangeUnionStr()); } diff --git a/src/main/java/io/v/nutz/zhgh/proposal/controller/statistics/ProposalDataBoardController.java b/src/main/java/io/v/nutz/zhgh/proposal/controller/statistics/ProposalDataBoardController.java index d32f790..4c25a3d 100644 --- a/src/main/java/io/v/nutz/zhgh/proposal/controller/statistics/ProposalDataBoardController.java +++ b/src/main/java/io/v/nutz/zhgh/proposal/controller/statistics/ProposalDataBoardController.java @@ -105,7 +105,7 @@ public class ProposalDataBoardController { .setParam("notGive", ProposalConstant.NOTGIVE) .setVar("meeting", Strings.isNotBlank(meetingId) ? "AND info.teacherMeetingId = '" + meetingId + "'" : ""); - if (!ShiroUtil.hasAnyRoles(new String[]{"sysadmin", "A06", "tamange"})) { + if (!ShiroUtil.hasAnyRoles(new String[]{"sysadmin", "SchoolUnionAdmin", "tamange"})) { if (ShiroUtil.hasRole("H04")) { sql.setVar("union", "AND un.unionid in " + vi.getMangeUnionStr()); } diff --git a/src/main/java/io/v/nutz/zhgh/proposal/controller/statistics/ProposalDelegationSumController.java b/src/main/java/io/v/nutz/zhgh/proposal/controller/statistics/ProposalDelegationSumController.java index 964ba1e..392a177 100644 --- a/src/main/java/io/v/nutz/zhgh/proposal/controller/statistics/ProposalDelegationSumController.java +++ b/src/main/java/io/v/nutz/zhgh/proposal/controller/statistics/ProposalDelegationSumController.java @@ -67,7 +67,7 @@ public class ProposalDelegationSumController { sql.setParam("opinion", ProposalConstant.OPINION); sql.setParam("notGive", ProposalConstant.NOTGIVE); - if (!ShiroUtil.hasAnyRoles(new String[]{"sysadmin", "A06", "tamange"})) { + if (!ShiroUtil.hasAnyRoles(new String[]{"sysadmin", "SchoolUnionAdmin", "tamange"})) { if (ShiroUtil.hasRole("jdhdbt01")) { cnd.and("dbt.id", " in ", "SELECT sur.dbtid FROM sys_user_role sur WHERE sur.userId = '" + ShiroUtil.getPrincipalProperty("id") + "' AND sur.roleId = '" + Roles.DBT_TZ + "' AND sur.jdhid = '" + meetingId + "'"); } diff --git a/src/main/java/io/v/nutz/zhgh/proposal/controller/statistics/ProposalHistoryController.java b/src/main/java/io/v/nutz/zhgh/proposal/controller/statistics/ProposalHistoryController.java index 22eeee9..3de34a0 100644 --- a/src/main/java/io/v/nutz/zhgh/proposal/controller/statistics/ProposalHistoryController.java +++ b/src/main/java/io/v/nutz/zhgh/proposal/controller/statistics/ProposalHistoryController.java @@ -106,7 +106,7 @@ public class ProposalHistoryController { cnd.and(seg); } - if (!ShiroUtil.hasAnyRoles(new String[]{"sysadmin", "A06", "tamange", "jdhdbt01", "H01"})) { + if (!ShiroUtil.hasAnyRoles(new String[]{"sysadmin", "SchoolUnionAdmin", "tamange", "jdhdbt01", "H01"})) { if (ShiroUtil.hasRole("H04")) { cnd.and("su.unionid", " in ", vi.getMangeUnionStr()); } diff --git a/src/main/java/io/v/nutz/zhgh/proposal/controller/statistics/ProposalIntegratedController.java b/src/main/java/io/v/nutz/zhgh/proposal/controller/statistics/ProposalIntegratedController.java index b01ced5..2e1a455 100644 --- a/src/main/java/io/v/nutz/zhgh/proposal/controller/statistics/ProposalIntegratedController.java +++ b/src/main/java/io/v/nutz/zhgh/proposal/controller/statistics/ProposalIntegratedController.java @@ -106,7 +106,7 @@ public class ProposalIntegratedController { """); cnd.groupBy("info.id"); cnd.andEX("info.stateCode", "=", stateCode); - if (!ShiroUtil.hasAnyRoles(new String[]{"sysadmin", "A06", "tamange", "jdhdbt01"})) { + if (!ShiroUtil.hasAnyRoles(new String[]{"sysadmin", "SchoolUnionAdmin", "tamange", "jdhdbt01"})) { if (ShiroUtil.hasRole("H04")) { cnd.and("su.unionid", " in ", vi.getMangeUnionStr()); } diff --git a/src/main/java/io/v/nutz/zhgh/proposal/controller/statistics/ProposalProgressController.java b/src/main/java/io/v/nutz/zhgh/proposal/controller/statistics/ProposalProgressController.java index a014260..55e7dc8 100644 --- a/src/main/java/io/v/nutz/zhgh/proposal/controller/statistics/ProposalProgressController.java +++ b/src/main/java/io/v/nutz/zhgh/proposal/controller/statistics/ProposalProgressController.java @@ -72,7 +72,7 @@ public class ProposalProgressController { cnd.andEx("info.stateCode", "=", stateCode); - if (!ShiroUtil.hasAnyRoles(new String[]{"sysadmin", "A06", "tamange"})) { + if (!ShiroUtil.hasAnyRoles(new String[]{"sysadmin", "SchoolUnionAdmin", "tamange"})) { if (ShiroUtil.hasAnyRoles("jdhdbt01,jdhdbt02")) { Jdh_db jdhDb = proposalInfoService.dao().fetch(Jdh_db.class, Cnd.where("dbid", "=", ShiroUtil.getUserId()).and("jdhid", "=", search.getMeetingId())); cnd.and("info.delegationId", " = ", jdhDb.getDbtid()); diff --git a/src/main/java/io/v/nutz/zhgh/proposal/controller/statistics/ProposalSummaryController.java b/src/main/java/io/v/nutz/zhgh/proposal/controller/statistics/ProposalSummaryController.java index 27e31da..d6cff38 100644 --- a/src/main/java/io/v/nutz/zhgh/proposal/controller/statistics/ProposalSummaryController.java +++ b/src/main/java/io/v/nutz/zhgh/proposal/controller/statistics/ProposalSummaryController.java @@ -91,7 +91,7 @@ public class ProposalSummaryController { $condition """); - if (!ShiroUtil.hasAnyRoles(new String[]{"sysadmin", "A06", "tamange", "jdhdbt01"})) { + if (!ShiroUtil.hasAnyRoles(new String[]{"sysadmin", "SchoolUnionAdmin", "tamange", "jdhdbt01"})) { if (ShiroUtil.hasRole("H04")) { cnd.and("su.unionid", " in ", vi.getMangeUnionStr()); } diff --git a/src/main/java/io/v/nutz/zhgh/proposal/controller/transact/ProposalAllFinishedQueryController.java b/src/main/java/io/v/nutz/zhgh/proposal/controller/transact/ProposalAllFinishedQueryController.java index 1e26a24..94c603a 100644 --- a/src/main/java/io/v/nutz/zhgh/proposal/controller/transact/ProposalAllFinishedQueryController.java +++ b/src/main/java/io/v/nutz/zhgh/proposal/controller/transact/ProposalAllFinishedQueryController.java @@ -57,7 +57,7 @@ public class ProposalAllFinishedQueryController { cnd.andEx("info.stateCode", "=", stateCode); - if (!ShiroUtil.hasAnyRoles(new String[]{"sysadmin", "A06", "tamange"})) { + if (!ShiroUtil.hasAnyRoles(new String[]{"sysadmin", "SchoolUnionAdmin", "tamange"})) { if (ShiroUtil.hasAnyRoles("jdhdbt01,jdhdbt02")) { Jdh_db jdhDb = proposalInfoService.dao().fetch(Jdh_db.class, Cnd.where("dbid", "=", ShiroUtil.getUserId()).and("jdhid", "=", search.getMeetingId())); cnd.and("info.delegationId", " = ", jdhDb.getDbtid()); diff --git a/src/main/java/io/v/nutz/zhgh/proposal/controller/transact/ProposalFeedbackScoreController.java b/src/main/java/io/v/nutz/zhgh/proposal/controller/transact/ProposalFeedbackScoreController.java index b184678..1d4c4e6 100644 --- a/src/main/java/io/v/nutz/zhgh/proposal/controller/transact/ProposalFeedbackScoreController.java +++ b/src/main/java/io/v/nutz/zhgh/proposal/controller/transact/ProposalFeedbackScoreController.java @@ -134,7 +134,7 @@ public class ProposalFeedbackScoreController { $condition """); - if (!ShiroUtil.hasAnyRoles("sysadmin, tamange,A06")) { + if (!ShiroUtil.hasAnyRoles("sysadmin, tamange,SchoolUnionAdmin")) { cnd.and("info.createUser", "=", ShiroUtil.getUserId()); } proposalInfoService.sortAndSearch(cnd, page, search); diff --git a/src/main/java/io/v/nutz/zhgh/proposal/controller/transact/ProposalReplyController.java b/src/main/java/io/v/nutz/zhgh/proposal/controller/transact/ProposalReplyController.java index 6449c5e..829729d 100644 --- a/src/main/java/io/v/nutz/zhgh/proposal/controller/transact/ProposalReplyController.java +++ b/src/main/java/io/v/nutz/zhgh/proposal/controller/transact/ProposalReplyController.java @@ -85,7 +85,7 @@ public class ProposalReplyController { public Object pageData(PageForm page, ProposalSearch search) { Cnd cnd = Cnd.NEW(); proposalInfoService.sortAndSearch(cnd, page, search); - if (ShiroUtil.hasAnyRoles("sysadmin, tamange,A06")) { + if (ShiroUtil.hasAnyRoles("sysadmin, tamange,SchoolUnionAdmin")) { return proposalReplyService.pageDataBySuperAdmin(page, cnd, search); } else { return proposalReplyService.pageDataByUnitAdmin(page, cnd, search); diff --git a/src/main/java/io/v/nutz/zhgh/proposal/services/impl/ProposalDataBoardServiceImpl.java b/src/main/java/io/v/nutz/zhgh/proposal/services/impl/ProposalDataBoardServiceImpl.java index e9ac776..a0efc22 100644 --- a/src/main/java/io/v/nutz/zhgh/proposal/services/impl/ProposalDataBoardServiceImpl.java +++ b/src/main/java/io/v/nutz/zhgh/proposal/services/impl/ProposalDataBoardServiceImpl.java @@ -118,7 +118,7 @@ public class ProposalDataBoardServiceImpl extends ViServiceImpl implements Propo } } - if (!ShiroUtil.hasAnyRoles(new String[]{"sysadmin", "A06", "tamange"})) { + if (!ShiroUtil.hasAnyRoles(new String[]{"sysadmin", "SchoolUnionAdmin", "tamange"})) { if (ShiroUtil.hasRole("H04")) { cnd.and("su.unionid", " in ", vi.getMangeUnionStr()); } @@ -175,7 +175,7 @@ public class ProposalDataBoardServiceImpl extends ViServiceImpl implements Propo sql.setVar("left_user_unit_union_info", "LEFT JOIN sys_user u ON info.createUser = u.id LEFT JOIN sys_unit un ON u.unitid= un.id"); sql.setVar("meeting", Strings.isNotBlank(meetingId) ? "AND info.teacherMeetingId = '" + meetingId + "'" : ""); - if (!ShiroUtil.hasAnyRoles(new String[]{"sysadmin", "A06", "tamange"})) { + if (!ShiroUtil.hasAnyRoles(new String[]{"sysadmin", "SchoolUnionAdmin", "tamange"})) { if (ShiroUtil.hasRole("H04")) { sql.setVar("union", "AND un.unionid in " + vi.getMangeUnionStr()); } diff --git a/src/main/java/io/v/nutz/zhgh/reimbursement/controller/ReimbursementSummaryController.java b/src/main/java/io/v/nutz/zhgh/reimbursement/controller/ReimbursementSummaryController.java index 98cbf42..c39d311 100644 --- a/src/main/java/io/v/nutz/zhgh/reimbursement/controller/ReimbursementSummaryController.java +++ b/src/main/java/io/v/nutz/zhgh/reimbursement/controller/ReimbursementSummaryController.java @@ -120,7 +120,7 @@ public class ReimbursementSummaryController { cnd.andEX("rei.reimbursementItemId", "=", reiItemId); } /* Vi.cndPlus(cnd, "rei.State", "=", ReimbursementState.SUCCESSFUL_REIMBURSEMENT);*/ - if (!ShiroUtil.hasAnyRoles("sysadmin,A06,gh12,wyh02,wyh03")) { + if (!ShiroUtil.hasAnyRoles("sysadmin,SchoolUnionAdmin,gh12,wyh02,wyh03")) { SqlExpressionGroup group = new SqlExpressionGroup(); if (ShiroUtil.hasAnyRoles("gh01,H04")) { group.or("rei.unionId", "=", Vi.getUnionId()); diff --git a/src/main/java/io/v/nutz/zhgh/shopping/controller/ShoppingTypeApplyController.java b/src/main/java/io/v/nutz/zhgh/shopping/controller/ShoppingTypeApplyController.java index 090da0c..39a0f7e 100644 --- a/src/main/java/io/v/nutz/zhgh/shopping/controller/ShoppingTypeApplyController.java +++ b/src/main/java/io/v/nutz/zhgh/shopping/controller/ShoppingTypeApplyController.java @@ -90,7 +90,7 @@ public class ShoppingTypeApplyController { $condition """); Cnd cnd = Cnd.NEW(); - if (!ShiroUtil.hasAnyRoles("sysadmin,A06")) { + if (!ShiroUtil.hasAnyRoles("sysadmin,SchoolUnionAdmin")) { cnd.andEX("st.loginName", "=", ShiroUtil.getPrincipalProperty("loginname")); } cnd.andEX("st.year", "=", year); @@ -201,7 +201,7 @@ public class ShoppingTypeApplyController { $condition """); Cnd cnd = Cnd.where("flexible", "=", 1); - if (!ShiroUtil.hasAnyRoles("sysadmin,A06")) { + if (!ShiroUtil.hasAnyRoles("sysadmin,SchoolUnionAdmin")) { cnd.and("welfareUnionId", "is", null); cnd.andEX("choiceTimeStart", ">", DateUtil.now()); } diff --git a/src/main/java/io/v/nutz/zhgh/single/service/impl/SingleUserServiceImpl.java b/src/main/java/io/v/nutz/zhgh/single/service/impl/SingleUserServiceImpl.java index e4ab82a..bc3a7db 100644 --- a/src/main/java/io/v/nutz/zhgh/single/service/impl/SingleUserServiceImpl.java +++ b/src/main/java/io/v/nutz/zhgh/single/service/impl/SingleUserServiceImpl.java @@ -92,7 +92,7 @@ public class SingleUserServiceImpl extends ViServiceImpl implements Si cnd.where().andLike("jobTitle", jobTitle); } - if (!ShiroUtil.hasAnyRoles("sysadmin,SchoolUnionMemberAdmin,A06")) { + if (!ShiroUtil.hasAnyRoles("sysadmin,SchoolUnionMemberAdmin,SchoolUnionAdmin")) { if (ShiroUtil.hasRole("H04")) { cnd.and("unionId", "=", Vi.getUnionId()); } else if (ShiroUtil.hasRole("ghxzzz")) { @@ -133,7 +133,7 @@ public class SingleUserServiceImpl extends ViServiceImpl implements Si sys_union un $condition """); - if (!ShiroUtil.hasAnyRoles(Lang.array("sysadmin", "A06", "SchoolUnionMemberAdmin"))) { + if (!ShiroUtil.hasAnyRoles(Lang.array("sysadmin", "SchoolUnionAdmin", "SchoolUnionMemberAdmin"))) { cnd.and("un.id", "=", Vi.getUnionId()); } if(StrUtil.isNotBlank(unionId)) { @@ -162,7 +162,7 @@ public class SingleUserServiceImpl extends ViServiceImpl implements Si $condition """); - if (!ShiroUtil.hasAnyRoles(Lang.array("sysadmin", "A06", "SchoolUnionMemberAdmin"))) { + if (!ShiroUtil.hasAnyRoles(Lang.array("sysadmin", "SchoolUnionAdmin", "SchoolUnionMemberAdmin"))) { cnd.and("un.unionid", "=", Vi.getUnionId()); } if(StrUtil.isNotBlank(unitId)) { @@ -240,7 +240,7 @@ public class SingleUserServiceImpl extends ViServiceImpl implements Si if (Strings.isNotBlank(jobTitle)) { cnd.where().andLike("jobTitle", jobTitle); } - if (!ShiroUtil.hasAnyRoles("sysadmin,SchoolUnionMemberAdmin,A06")) { + if (!ShiroUtil.hasAnyRoles("sysadmin,SchoolUnionMemberAdmin,SchoolUnionAdmin")) { if (ShiroUtil.hasRole("H04")) { cnd.and("unionId", "=", Vi.getUnionId()); } else if (ShiroUtil.hasRole("ghxzzz")) { diff --git a/src/main/java/io/v/nutz/zhgh/suggestion/controller/SuggestionApply.java b/src/main/java/io/v/nutz/zhgh/suggestion/controller/SuggestionApply.java index e14c060..491bdf3 100644 --- a/src/main/java/io/v/nutz/zhgh/suggestion/controller/SuggestionApply.java +++ b/src/main/java/io/v/nutz/zhgh/suggestion/controller/SuggestionApply.java @@ -93,7 +93,7 @@ public class SuggestionApply { $condition """); Cnd cnd = Cnd.NEW(); - if (!ShiroUtil.hasAnyRoles("sysadmin,A06")) { + if (!ShiroUtil.hasAnyRoles("sysadmin,SchoolUnionAdmin")) { cnd.and("su.applyUser", "=", ShiroUtil.getPrincipalProperty("id")); } if (Strings.isNotBlank(suggestionName)) { diff --git a/src/main/java/io/v/nutz/zhgh/suggestion/controller/SuggestionList.java b/src/main/java/io/v/nutz/zhgh/suggestion/controller/SuggestionList.java index f2c0d9f..821f5f1 100644 --- a/src/main/java/io/v/nutz/zhgh/suggestion/controller/SuggestionList.java +++ b/src/main/java/io/v/nutz/zhgh/suggestion/controller/SuggestionList.java @@ -54,7 +54,7 @@ public class SuggestionList { LEFT JOIN proposal_type type ON type.id = su.suggestionType $condition """); Cnd cnd = Cnd.NEW(); - if (!ShiroUtil.hasAnyRoles("sysadmin,A06")) { + if (!ShiroUtil.hasAnyRoles("sysadmin,SchoolUnionAdmin")) { cnd.and("su.levelJdhUser", "=", ShiroUtil.getPrincipalProperty("id")); } if (Strings.isNotBlank(taName)) { diff --git a/src/main/java/io/v/nutz/zhgh/therapyRecuperation/constant/TheRapyRecuperationSignUpMode.java b/src/main/java/io/v/nutz/zhgh/therapyRecuperation/constant/TheRapyRecuperationSignUpMode.java index bbbf943..305c2d4 100644 --- a/src/main/java/io/v/nutz/zhgh/therapyRecuperation/constant/TheRapyRecuperationSignUpMode.java +++ b/src/main/java/io/v/nutz/zhgh/therapyRecuperation/constant/TheRapyRecuperationSignUpMode.java @@ -19,12 +19,12 @@ public enum TheRapyRecuperationSignUpMode { /** * 基层工会模式 */ - UNION(1, "基层工会组织", new String[]{"H04", "A06", "sysadmin"}), + UNION(1, "基层工会组织", new String[]{"H04", "SchoolUnionAdmin", "sysadmin"}), /** * 自由模式 */ - FREE(2, "校工会组织", new String[]{"A06", "sysadmin"}); + FREE(2, "校工会组织", new String[]{"SchoolUnionAdmin", "sysadmin"}); private final int value; diff --git a/src/main/java/io/v/nutz/zhgh/therapyRecuperation/controller/baseManage/TheRapyRecuperationBaseManagerController.java b/src/main/java/io/v/nutz/zhgh/therapyRecuperation/controller/baseManage/TheRapyRecuperationBaseManagerController.java index c43e017..1a65334 100644 --- a/src/main/java/io/v/nutz/zhgh/therapyRecuperation/controller/baseManage/TheRapyRecuperationBaseManagerController.java +++ b/src/main/java/io/v/nutz/zhgh/therapyRecuperation/controller/baseManage/TheRapyRecuperationBaseManagerController.java @@ -93,7 +93,7 @@ public class TheRapyRecuperationBaseManagerController { @POST @Ok("json:full") @ViReturn - @RequiresRoles(value = {"sysadmin", "A06", "H04", "lxygys"}, logical = Logical.OR) + @RequiresRoles(value = {"sysadmin", "SchoolUnionAdmin", "H04", "lxygys"}, logical = Logical.OR) public Object pageData(PageForm pageForm, @Param(value = "year", required = false) Integer year, @Param(value = "lotId", required = false) String lotId, @@ -143,7 +143,7 @@ public class TheRapyRecuperationBaseManagerController { cnd.desc("tb.`year`"); cnd.asc("tb.sortNumber"); cnd.asc("tb.id"); - if (!ShiroUtil.hasAnyRoles(List.of("sysadmin", "A06"))) { + if (!ShiroUtil.hasAnyRoles(List.of("sysadmin", "SchoolUnionAdmin"))) { if (ShiroUtil.hasRole("H04")) { cnd.and("tb.createUnionId", "=", Vi.getUnionId()); } else { @@ -200,7 +200,7 @@ public class TheRapyRecuperationBaseManagerController { @POST @ViReturn @SLog(type = "theRapyRecuperation", tag = "疗休养目的地管理", msg = "添加目的地") - @RequiresRoles(value = {"sysadmin", "A06", "H04", "lxygys"}, logical = Logical.OR) + @RequiresRoles(value = {"sysadmin", "SchoolUnionAdmin", "H04", "lxygys"}, logical = Logical.OR) public Object doSubmit(@Param("base") TheRapyRecuperationBaseManagement baseManagement) { baseManagement.setOpBy((String) ShiroUtil.getPrincipalProperty("id")); baseManagement.setCreateUnionId((String) ShiroUtil.getPrincipalProperty("unionid")); diff --git a/src/main/java/io/v/nutz/zhgh/therapyRecuperation/controller/basicManage/TheRapyRecuperationLineController.java b/src/main/java/io/v/nutz/zhgh/therapyRecuperation/controller/basicManage/TheRapyRecuperationLineController.java index 49989aa..af0eed0 100644 --- a/src/main/java/io/v/nutz/zhgh/therapyRecuperation/controller/basicManage/TheRapyRecuperationLineController.java +++ b/src/main/java/io/v/nutz/zhgh/therapyRecuperation/controller/basicManage/TheRapyRecuperationLineController.java @@ -83,7 +83,7 @@ public class TheRapyRecuperationLineController { @POST @Ok("json:full") @ViReturn - @RequiresRoles(value = {"sysadmin", "A06", "H04", "lxygys"}, logical = Logical.OR) + @RequiresRoles(value = {"sysadmin", "SchoolUnionAdmin", "H04", "lxygys"}, logical = Logical.OR) public Object pageData(PageForm pageForm, @Param(value = "year", required = false) Integer year, @Param(value = "keywords", required = false) String keywords, @@ -104,7 +104,7 @@ public class TheRapyRecuperationLineController { cnd.and(seg); }*/ cnd.desc("year"); - if (!ShiroUtil.hasAnyRoles(List.of("sysadmin", "A06"))) { + if (!ShiroUtil.hasAnyRoles(List.of("sysadmin", "SchoolUnionAdmin"))) { if (ShiroUtil.hasRole("H04")) { cnd.and("line.createUnionId", "=", Vi.getUnionId()); } else { @@ -127,7 +127,7 @@ public class TheRapyRecuperationLineController { @At @POST @ViReturn - @RequiresRoles(value = {"sysadmin", "A06", "H04", "lxygys"}, logical = Logical.OR) + @RequiresRoles(value = {"sysadmin", "SchoolUnionAdmin", "H04", "lxygys"}, logical = Logical.OR) public Object doSubmit(@Param("line") TheRapyRecuperationLine line) { if (StrUtil.isBlank(line.getId())) { if (lineService.count(Cnd.where("serialNumber", "=", line.getSerialNumber())) > 0) { @@ -213,7 +213,7 @@ public class TheRapyRecuperationLineController { @At("/getCreateMode") @ViReturn public Object getCreateMode() { - boolean hasSchoolAdminRole = ShiroUtil.hasAnyRoles(List.of("sysadmin", "A06")); + boolean hasSchoolAdminRole = ShiroUtil.hasAnyRoles(List.of("sysadmin", "SchoolUnionAdmin")); if (hasSchoolAdminRole) { return TheRapyRecuperationLineCreateMode.SCHOOL.getValue(); } diff --git a/src/main/java/io/v/nutz/zhgh/therapyRecuperation/controller/process/TheRapyRecuperationLineAdjustmentController.java b/src/main/java/io/v/nutz/zhgh/therapyRecuperation/controller/process/TheRapyRecuperationLineAdjustmentController.java index 2adaeac..e8011e7 100644 --- a/src/main/java/io/v/nutz/zhgh/therapyRecuperation/controller/process/TheRapyRecuperationLineAdjustmentController.java +++ b/src/main/java/io/v/nutz/zhgh/therapyRecuperation/controller/process/TheRapyRecuperationLineAdjustmentController.java @@ -60,7 +60,7 @@ public class TheRapyRecuperationLineAdjustmentController { @POST @Ok("json:full") @ViReturn - @RequiresRoles(value = {"sysadmin", "A06", "H04"}, logical = Logical.OR) + @RequiresRoles(value = {"sysadmin", "SchoolUnionAdmin", "H04"}, logical = Logical.OR) public Object pageData(PageForm pageForm, @Param(value = "year", required = false) Integer year, @Param(value = "lineId", required = false) String lineId, diff --git a/src/main/java/io/v/nutz/zhgh/therapyRecuperation/controller/process/TheRapyRecuperationLineUnionSelectController.java b/src/main/java/io/v/nutz/zhgh/therapyRecuperation/controller/process/TheRapyRecuperationLineUnionSelectController.java index 52cd943..f29d219 100644 --- a/src/main/java/io/v/nutz/zhgh/therapyRecuperation/controller/process/TheRapyRecuperationLineUnionSelectController.java +++ b/src/main/java/io/v/nutz/zhgh/therapyRecuperation/controller/process/TheRapyRecuperationLineUnionSelectController.java @@ -209,7 +209,7 @@ public class TheRapyRecuperationLineUnionSelectController { if (mode == 1 && !ShiroUtil.hasRole("H04")) { return Result.error("您没有基层工会角色权限！"); - } else if (mode == 2 && !ShiroUtil.hasRole("A06")) { + } else if (mode == 2 && !ShiroUtil.hasRole("SchoolUnionAdmin")) { return Result.error("您没有校工会角色权限！"); } return Result.success(unionSelectService.selectLineInfo(lineId, unionId, mode)); diff --git a/src/main/java/io/v/nutz/zhgh/therapyRecuperation/controller/process/TheRapyRecuperationUnionQueryController.java b/src/main/java/io/v/nutz/zhgh/therapyRecuperation/controller/process/TheRapyRecuperationUnionQueryController.java index e5e7d20..d251e90 100644 --- a/src/main/java/io/v/nutz/zhgh/therapyRecuperation/controller/process/TheRapyRecuperationUnionQueryController.java +++ b/src/main/java/io/v/nutz/zhgh/therapyRecuperation/controller/process/TheRapyRecuperationUnionQueryController.java @@ -199,7 +199,7 @@ public class TheRapyRecuperationUnionQueryController { cnd.and(seg); } - if (ShiroUtil.hasAnyRoles("sysadmin,A06")) { + if (ShiroUtil.hasAnyRoles("sysadmin,SchoolUnionAdmin")) { if (Strings.isNotBlank(unionId) && state.equals("1")) { cnd.and(Cnd.exps("enroll.takePartInUnionId", "=", unionId).or("enroll.selfUnionId", "=", unionId)); } @@ -360,7 +360,7 @@ public class TheRapyRecuperationUnionQueryController { cnd.andEX("enroll.stateId", "=", TheRapyRecuperationState.PASS); cnd.andEX("enroll.selfUnitId", "=", unitId); cnd.andEX("enroll.isNormal", "=", true); - if (!ShiroUtil.hasAnyRoles("sysadmin,A06")) { + if (!ShiroUtil.hasAnyRoles("sysadmin,SchoolUnionAdmin")) { if (StrUtil.isNotBlank(unionId)) { cnd.and("enroll.selfUnionId", "=", unionId); } else { diff --git a/src/main/java/io/v/nutz/zhgh/therapyRecuperation/service/impl/TheRapyRecuperationLineAdjustmentServiceImpl.java b/src/main/java/io/v/nutz/zhgh/therapyRecuperation/service/impl/TheRapyRecuperationLineAdjustmentServiceImpl.java index 709e2e5..4dec772 100644 --- a/src/main/java/io/v/nutz/zhgh/therapyRecuperation/service/impl/TheRapyRecuperationLineAdjustmentServiceImpl.java +++ b/src/main/java/io/v/nutz/zhgh/therapyRecuperation/service/impl/TheRapyRecuperationLineAdjustmentServiceImpl.java @@ -76,7 +76,7 @@ public class TheRapyRecuperationLineAdjustmentServiceImpl extends ViServiceImpl cnd.and("us.playStartTime", "is not", null); cnd.andEX("line.year", "=", year); cnd.andEX("line.id", "=", lineId); - if (ShiroUtil.hasAnyRoles("sysadmin,A06")) { + if (ShiroUtil.hasAnyRoles("sysadmin,SchoolUnionAdmin")) { cnd.andEX("us.unionId", "=", unionId); cnd.andEX("us.signUpMode", "=", Strings.isNotBlank(unionId) ? 1 : 2); } else { diff --git a/src/main/java/io/v/nutz/zhgh/therapyRecuperation/service/impl/TheRapyRecuperationLineClusterServiceImpl.java b/src/main/java/io/v/nutz/zhgh/therapyRecuperation/service/impl/TheRapyRecuperationLineClusterServiceImpl.java index 54c485b..bc833ef 100644 --- a/src/main/java/io/v/nutz/zhgh/therapyRecuperation/service/impl/TheRapyRecuperationLineClusterServiceImpl.java +++ b/src/main/java/io/v/nutz/zhgh/therapyRecuperation/service/impl/TheRapyRecuperationLineClusterServiceImpl.java @@ -121,7 +121,7 @@ public class TheRapyRecuperationLineClusterServiceImpl extends ViServiceImpl impl sys_union un $condition """); - if (!ShiroUtil.hasAnyRoles("sysadmin,A06")) { + if (!ShiroUtil.hasAnyRoles("sysadmin,SchoolUnionAdmin")) { if (ShiroUtil.hasAnyRoles("H04,gh12")) { cnd.and("un.id", "=", Vi.getUnionId()); } @@ -210,7 +210,7 @@ public class WelfareSingleServiceImpl extends ViServiceImpl impl """); CndPlus cnd = CndPlus.create(); - if (!ShiroUtil.hasAnyRoles("sysadmin,A06,SchoolUnionWelfareAdmin")) { + if (!ShiroUtil.hasAnyRoles("sysadmin,SchoolUnionAdmin,SchoolUnionWelfareAdmin")) { cnd.and("unit.welfareUnitId", "=", Vi.getUnionId()); } diff --git a/src/main/java/io/v/nutz/zhgh/zc/controller/ZgfwGdzcbgController.java b/src/main/java/io/v/nutz/zhgh/zc/controller/ZgfwGdzcbgController.java index ff9877e..2acabf3 100644 --- a/src/main/java/io/v/nutz/zhgh/zc/controller/ZgfwGdzcbgController.java +++ b/src/main/java/io/v/nutz/zhgh/zc/controller/ZgfwGdzcbgController.java @@ -104,7 +104,7 @@ public class ZgfwGdzcbgController { $condition """).setParam("zcpdid", zcpdid); Cnd cnd = Cnd.NEW(); - if (!ShiroUtil.hasAnyRoles("sysadmin,A06")) { + if (!ShiroUtil.hasAnyRoles("sysadmin,SchoolUnionAdmin")) { cnd.andEX("xx.zcghlx", "=", "1"); cnd.andEX("xx.zclydwhid", "=", Vi.getUnionId()); } else { @@ -210,7 +210,7 @@ public class ZgfwGdzcbgController { $condition """).setParam("zcpdid", zcpdid); Cnd cnd = Cnd.NEW(); - if (!ShiroUtil.hasAnyRoles("sysadmin,A06")) { + if (!ShiroUtil.hasAnyRoles("sysadmin,SchoolUnionAdmin")) { cnd.andEX("zc.zcghlx", "=", "1"); cnd.andEX("zc.zclydwhid", "=", Vi.getUnionId()); unitname = Vi.getUnit().getName(); @@ -294,7 +294,7 @@ public class ZgfwGdzcbgController { $condition """).setParam("zcpdid", zcpdid); Cnd cnd = Cnd.NEW(); - if (!ShiroUtil.hasAnyRoles("sysadmin,A06")) { + if (!ShiroUtil.hasAnyRoles("sysadmin,SchoolUnionAdmin")) { /*if (ShiroUtil.hasRole("H04")) { cnd.andEX("zc.zcghlx", "=", "1"); cnd.andEX("zc.zclydwhid", "=", Vi.getUnionId()); diff --git a/src/main/java/io/v/nutz/zhgh/zgfw/controller/condolence/CondolenceReadCon.java b/src/main/java/io/v/nutz/zhgh/zgfw/controller/condolence/CondolenceReadCon.java index 5bcedf1..d4c608b 100644 --- a/src/main/java/io/v/nutz/zhgh/zgfw/controller/condolence/CondolenceReadCon.java +++ b/src/main/java/io/v/nutz/zhgh/zgfw/controller/condolence/CondolenceReadCon.java @@ -108,7 +108,7 @@ public class CondolenceReadCon { Cnd cnd = Cnd.NEW(); - if (!ShiroUtil.hasAnyRoles("sysadmin,A06,wyh02")) { + if (!ShiroUtil.hasAnyRoles("sysadmin,SchoolUnionAdmin,wyh02")) { SqlExpressionGroup group2 = new SqlExpressionGroup(); if (ShiroUtil.hasAnyRoles("gh01,H04")) { group2.or("be.unionid", "=", Vi.getUnionId()); @@ -117,7 +117,7 @@ public class CondolenceReadCon { /* if (ShiroUtil.hasAnyRoles("SchoolUnionAccountant")) { group2.or("con.state_id", ">=", 2020); } - if (ShiroUtil.hasAnyRoles("A06")) { + if (ShiroUtil.hasAnyRoles("SchoolUnionAdmin")) { group2.or("con.state_id", ">=", 2040); }*/ /* if (ShiroUtil.hasAnyRoles("")) { diff --git a/src/main/java/io/v/nutz/zhgh/zgfw/controller/difficult/DifficultyApplyController.java b/src/main/java/io/v/nutz/zhgh/zgfw/controller/difficult/DifficultyApplyController.java index 525adf7..2d5f5b7 100644 --- a/src/main/java/io/v/nutz/zhgh/zgfw/controller/difficult/DifficultyApplyController.java +++ b/src/main/java/io/v/nutz/zhgh/zgfw/controller/difficult/DifficultyApplyController.java @@ -123,7 +123,7 @@ public class DifficultyApplyController { FROM `user` $condition """); - if (!ShiroUtil.hasAnyRoles("sysadmin,A06")) { + if (!ShiroUtil.hasAnyRoles("sysadmin,SchoolUnionAdmin")) { cnd.and("unionid", "=", Vi.getUnionId()); if (!ShiroUtil.hasAnyRoles("gh01")){ cnd.and("id", "=", ShiroUtil.getUserId()); diff --git a/src/main/java/io/v/nutz/zhgh/zgfw/controller/rxdj/RxdjShController.java b/src/main/java/io/v/nutz/zhgh/zgfw/controller/rxdj/RxdjShController.java index 580fba2..00aa37f 100644 --- a/src/main/java/io/v/nutz/zhgh/zgfw/controller/rxdj/RxdjShController.java +++ b/src/main/java/io/v/nutz/zhgh/zgfw/controller/rxdj/RxdjShController.java @@ -139,7 +139,7 @@ public class RxdjShController { // } cnd.and("dj.dj_sqzt", "=", 5300); } - if (!ShiroUtil.hasAnyRoles("sysadmin,A06")) { + if (!ShiroUtil.hasAnyRoles("sysadmin,SchoolUnionAdmin")) { cnd.andEX("ur.unionid", "=", Vi.getUnionId()); } cnd.andEX("dj.dj_year", "=", year); diff --git a/src/main/java/io/v/nutz/zhgh/zgfw/controller/rxdj/RxdjZhcxController.java b/src/main/java/io/v/nutz/zhgh/zgfw/controller/rxdj/RxdjZhcxController.java index 97f5305..3e05522 100644 --- a/src/main/java/io/v/nutz/zhgh/zgfw/controller/rxdj/RxdjZhcxController.java +++ b/src/main/java/io/v/nutz/zhgh/zgfw/controller/rxdj/RxdjZhcxController.java @@ -147,7 +147,7 @@ public class RxdjZhcxController { cnd.andEX("rx.dj_sqzt", "=", 5100); } - if (!ShiroUtil.hasAnyRoles("sysadmin,A06")) { + if (!ShiroUtil.hasAnyRoles("sysadmin,SchoolUnionAdmin")) { if (ShiroUtil.hasRole("H04")) { cnd.andEX("u.unionid", "=", Vi.getUnionId()); } @@ -161,7 +161,7 @@ public class RxdjZhcxController { maps.get(i).put("index", i + 1); } map.put("maplist", maps); - if (!ShiroUtil.hasAnyRoles("why02,why03,A06,sysadmin")) { + if (!ShiroUtil.hasAnyRoles("why02,why03,SchoolUnionAdmin,sysadmin")) { map.put("unionname", "院级工会 （单位公章）："); map.put("unionUsername", "工会主席（签名）："); } diff --git a/src/main/java/io/v/nutz/zhgh/zgfw/controller/rxdj/mobile/rxdjMobileController.java b/src/main/java/io/v/nutz/zhgh/zgfw/controller/rxdj/mobile/rxdjMobileController.java index 2f8dda4..e9b402e 100644 --- a/src/main/java/io/v/nutz/zhgh/zgfw/controller/rxdj/mobile/rxdjMobileController.java +++ b/src/main/java/io/v/nutz/zhgh/zgfw/controller/rxdj/mobile/rxdjMobileController.java @@ -106,9 +106,9 @@ public class rxdjMobileController { @At("/auditHtml") @Ok("re") public String auditHtml(Integer dj_sqzt) { - if (dj_sqzt == 5100 && ShiroUtil.hasAnyRoles("H04,A06,sysadmin")) { + if (dj_sqzt == 5100 && ShiroUtil.hasAnyRoles("H04,SchoolUnionAdmin,sysadmin")) { return "beetl:/mobile/rxdj/unitAudit.html"; - } else if (dj_sqzt == 5200 && ShiroUtil.hasAnyRoles("A06,wyh02,wyh03,sysadmin")) { + } else if (dj_sqzt == 5200 && ShiroUtil.hasAnyRoles("SchoolUnionAdmin,wyh02,wyh03,sysadmin")) { return "beetl:/mobile/rxdj/schoolAudit.html"; } return "beetl:/mobile/rxdj/applyInfo.html"; diff --git a/src/main/java/io/v/nutz/zhgh/zgfw/controller/rxdj/rxdjAgentController.java b/src/main/java/io/v/nutz/zhgh/zgfw/controller/rxdj/rxdjAgentController.java index 160bf35..623d714 100644 --- a/src/main/java/io/v/nutz/zhgh/zgfw/controller/rxdj/rxdjAgentController.java +++ b/src/main/java/io/v/nutz/zhgh/zgfw/controller/rxdj/rxdjAgentController.java @@ -59,7 +59,7 @@ public class rxdjAgentController { if (ShiroUtil.hasAnyRoles("H04,gh01")) { result.add(new NutMap().setv("title", title).setv("url", unitUrl).setv("iconClass", vi.getIconByPath(UNIT)).setv("label", "待基层工会审核").setv("number", getUnitCount())); } - if (ShiroUtil.hasAnyRoles("A06,wyh02")) { + if (ShiroUtil.hasAnyRoles("SchoolUnionAdmin,wyh02")) { result.add(new NutMap().setv("title", title).setv("url", schoolUrl).setv("iconClass", vi.getIconByPath(SCHOOL)).setv("label", "待校工会审核").setv("number", getSchoolCount())); } } diff --git a/src/main/java/io/v/nutz/zhgh/zgfw/controller/znxx/ZnxxStatisticsController.java b/src/main/java/io/v/nutz/zhgh/zgfw/controller/znxx/ZnxxStatisticsController.java index 8d1746d..066c3e5 100644 --- a/src/main/java/io/v/nutz/zhgh/zgfw/controller/znxx/ZnxxStatisticsController.java +++ b/src/main/java/io/v/nutz/zhgh/zgfw/controller/znxx/ZnxxStatisticsController.java @@ -85,7 +85,7 @@ public class ZnxxStatisticsController { if (Vi.isNotBlank(pageForm.getSearchName(), pageForm.getSearchKeyword())) { cnd.where().andLike(pageForm.getSearchName(), pageForm.getSearchKeyword()); } - if (!ShiroUtil.hasAnyRoles("sysadmin,A06")) { + if (!ShiroUtil.hasAnyRoles("sysadmin,SchoolUnionAdmin")) { cnd.and("u.unionid", "=", Vi.getUnionId()); } @@ -134,7 +134,7 @@ public class ZnxxStatisticsController { """); Cnd cnd = Cnd.NEW(); cnd.and("dj.applyType", "=", "znxx"); - if (!ShiroUtil.hasAnyRoles("sysadmin,A06")) { + if (!ShiroUtil.hasAnyRoles("sysadmin,SchoolUnionAdmin")) { cnd.and("u.unionid", "=", Vi.getUnionId()); } cnd.andEX("dj.dj_jdxx", "=", dj_jdxx); diff --git a/src/main/resources/views/mobile/activity/site/audit.html b/src/main/resources/views/mobile/activity/site/audit.html index 1819953..0da4347 100644 --- a/src/main/resources/views/mobile/activity/site/audit.html +++ b/src/main/resources/views/mobile/activity/site/audit.html @@ -326,7 +326,7 @@ layout("/mobile/platform.html"){ 审核状态： {{item.stateName}} - diff --git a/src/main/resources/views/mobile/condolence/audit_list.html b/src/main/resources/views/mobile/condolence/audit_list.html index a08dfcb..c454047 100644 --- a/src/main/resources/views/mobile/condolence/audit_list.html +++ b/src/main/resources/views/mobile/condolence/audit_list.html @@ -87,7 +87,7 @@ layout("/mobile/platform.html"){ }, async flushUnits() { //this.$set(this.pageForm, "unitId", "") - if ("${@shiro.hasRole('sysadmin')||@shiro.hasRole('A06')||@shiro.hasRole('SchoolUnionMemberAdmin')}" === "true") { + if ("${@shiro.hasRole('sysadmin')||@shiro.hasRole('SchoolUnionAdmin')||@shiro.hasRole('SchoolUnionMemberAdmin')}" === "true") { await mCommon.getUnitList(this.pageForm.unionId) } else { await mCommon.getUnitList("${@shiro.getPrincipalProperty('unit').getUnionid()}") diff --git a/src/main/resources/views/mobile/condolence/branchunionaudit/index.html b/src/main/resources/views/mobile/condolence/branchunionaudit/index.html index 8598ce4..63810da 100644 --- a/src/main/resources/views/mobile/condolence/branchunionaudit/index.html +++ b/src/main/resources/views/mobile/condolence/branchunionaudit/index.html @@ -351,7 +351,7 @@ layout("/mobile/platform.html"){ } }, async initData() { - if ("${@shiro.hasRole('sysadmin')||@shiro.hasRole('A06')}" === "true") { + if ("${@shiro.hasRole('sysadmin')||@shiro.hasRole('SchoolUnionAdmin')}" === "true") { await this.flushUnits() } else { await this.flushUnits("${@shiro.getPrincipalProperty('unit').getUnionid()}") diff --git a/src/main/resources/views/mobile/condolence/schoolchairmanaudit/index.html b/src/main/resources/views/mobile/condolence/schoolchairmanaudit/index.html index fd8adbc..83ed281 100644 --- a/src/main/resources/views/mobile/condolence/schoolchairmanaudit/index.html +++ b/src/main/resources/views/mobile/condolence/schoolchairmanaudit/index.html @@ -361,7 +361,7 @@ layout("/mobile/platform.html"){ } }, async initData() { - if ("${@shiro.hasRole('sysadmin')||@shiro.hasRole('A06')}" === 'true') { + if ("${@shiro.hasRole('sysadmin')||@shiro.hasRole('SchoolUnionAdmin')}" === 'true') { await this.initUnion() await this.flushUnits() } else { diff --git a/src/main/resources/views/mobile/condolence/schoolunionaudit/index.html b/src/main/resources/views/mobile/condolence/schoolunionaudit/index.html index c968782..35736ea 100644 --- a/src/main/resources/views/mobile/condolence/schoolunionaudit/index.html +++ b/src/main/resources/views/mobile/condolence/schoolunionaudit/index.html @@ -408,7 +408,7 @@ layout("/mobile/platform.html"){ } }, async initData() { - if ("${@shiro.hasRole('sysadmin')||@shiro.hasRole('A06')}" === "true") { + if ("${@shiro.hasRole('sysadmin')||@shiro.hasRole('SchoolUnionAdmin')}" === "true") { await this.initUnion() await this.flushUnits() } else { diff --git a/src/main/resources/views/mobile/difficulty/audit_list.html b/src/main/resources/views/mobile/difficulty/audit_list.html index af52def..443bb12 100644 --- a/src/main/resources/views/mobile/difficulty/audit_list.html +++ b/src/main/resources/views/mobile/difficulty/audit_list.html @@ -86,7 +86,7 @@ layout("/mobile/platform.html"){ }, 600) }, async flushUnits() { - if ("${@shiro.hasRole('sysadmin')||@shiro.hasRole('A06')||@shiro.hasRole('SchoolUnionMemberAdmin')}" === "true") { + if ("${@shiro.hasRole('sysadmin')||@shiro.hasRole('SchoolUnionAdmin')||@shiro.hasRole('SchoolUnionMemberAdmin')}" === "true") { await mCommon.getUnitList(this.pageForm.unionId) } else { await mCommon.getUnitList("${@shiro.getPrincipalProperty('unit').getUnionid()}") diff --git a/src/main/resources/views/mobile/difficulty/branchunionaudit/index.html b/src/main/resources/views/mobile/difficulty/branchunionaudit/index.html index 9aa50ac..7188bfb 100644 --- a/src/main/resources/views/mobile/difficulty/branchunionaudit/index.html +++ b/src/main/resources/views/mobile/difficulty/branchunionaudit/index.html @@ -357,7 +357,7 @@ layout("/mobile/platform.html"){ } }, async initData() { - if ("${@shiro.hasRole('sysadmin')||@shiro.hasRole('A06')}" === "true") { + if ("${@shiro.hasRole('sysadmin')||@shiro.hasRole('SchoolUnionAdmin')}" === "true") { await this.flushUnits() } else { await this.flushUnits("${@shiro.getPrincipalProperty('unit').getUnionid()}") diff --git a/src/main/resources/views/mobile/difficulty/mine/index.html b/src/main/resources/views/mobile/difficulty/mine/index.html index 9b8ff5b..abd691e 100644 --- a/src/main/resources/views/mobile/difficulty/mine/index.html +++ b/src/main/resources/views/mobile/difficulty/mine/index.html @@ -272,7 +272,7 @@ layout("/mobile/platform.html"){ } }, async initData() { - if ("${@shiro.hasRole('sysadmin')||@shiro.hasRole('A06')}" === 'true') { + if ("${@shiro.hasRole('sysadmin')||@shiro.hasRole('SchoolUnionAdmin')}" === 'true') { await this.initUnion() await this.flushUnits() } else { diff --git a/src/main/resources/views/mobile/difficulty/schoolunionfinalaudit/index.html b/src/main/resources/views/mobile/difficulty/schoolunionfinalaudit/index.html index 359139b..ac92d09 100644 --- a/src/main/resources/views/mobile/difficulty/schoolunionfinalaudit/index.html +++ b/src/main/resources/views/mobile/difficulty/schoolunionfinalaudit/index.html @@ -348,7 +348,7 @@ layout("/mobile/platform.html"){ } }, async initData() { - if ("${@shiro.hasRole('sysadmin')||@shiro.hasRole('A06')}" === 'true') { + if ("${@shiro.hasRole('sysadmin')||@shiro.hasRole('SchoolUnionAdmin')}" === 'true') { await this.initUnion() await this.flushUnits() } else { diff --git a/src/main/resources/views/mobile/difficulty/schoolunioninitialaudit/index.html b/src/main/resources/views/mobile/difficulty/schoolunioninitialaudit/index.html index b78526a..be51563 100644 --- a/src/main/resources/views/mobile/difficulty/schoolunioninitialaudit/index.html +++ b/src/main/resources/views/mobile/difficulty/schoolunioninitialaudit/index.html @@ -348,7 +348,7 @@ layout("/mobile/platform.html"){ } }, async initData() { - if ("${@shiro.hasRole('sysadmin')||@shiro.hasRole('A06')}" === 'true') { + if ("${@shiro.hasRole('sysadmin')||@shiro.hasRole('SchoolUnionAdmin')}" === 'true') { await this.initUnion() await this.flushUnits() } else { diff --git a/src/main/resources/views/mobile/home.html b/src/main/resources/views/mobile/home.html index 3be9036..4ec718e 100644 --- a/src/main/resources/views/mobile/home.html +++ b/src/main/resources/views/mobile/home.html @@ -165,7 +165,7 @@ layout("/mobile/platform.html"){ } .pwd_popup { - width: 96%; + width: 80%; height: auto; border-radius: 20px; } diff --git a/src/main/resources/views/mobile/member/query.html b/src/main/resources/views/mobile/member/query.html index 160d6bd..5acb766 100644 --- a/src/main/resources/views/mobile/member/query.html +++ b/src/main/resources/views/mobile/member/query.html @@ -223,7 +223,7 @@ layout("/mobile/platform.html"){ } }, async initUnion() { - if ("${@shiro.hasRole('sysadmin')||@shiro.hasRole('A06')}" === "true") { + if ("${@shiro.hasRole('sysadmin')||@shiro.hasRole('SchoolUnionAdmin')}" === "true") { this.unionList = await getUnionList(null) } else { this.unionList = await getUnionList("${@shiro.getPrincipalProperty('unit').getUnionid()}") @@ -232,7 +232,7 @@ layout("/mobile/platform.html"){ v.text = v.unionname v.value = v.id }) - if ("${@shiro.hasRole('sysadmin')||@shiro.hasRole('A06')}" === "true") { + if ("${@shiro.hasRole('sysadmin')||@shiro.hasRole('SchoolUnionAdmin')}" === "true") { this.unionList.unshift({ text: "全部工会", value: null }) } if (this.unionList && this.unionList.length > 0) { @@ -245,7 +245,7 @@ layout("/mobile/platform.html"){ v.text = v.name v.value = v.id }) - if ("${@shiro.hasRole('sysadmin')||@shiro.hasRole('A06')}" === "true" && this.pageForm.unionId === null) { + if ("${@shiro.hasRole('sysadmin')||@shiro.hasRole('SchoolUnionAdmin')}" === "true" && this.pageForm.unionId === null) { this.unitList.unshift({ text: "全部单位", value: null }) } if (this.unitList && this.unitList.length > 0) { @@ -253,7 +253,7 @@ layout("/mobile/platform.html"){ } }, async flushUnits() { - if ("${@shiro.hasRole('sysadmin')||@shiro.hasRole('A06')}" === "true") { + if ("${@shiro.hasRole('sysadmin')||@shiro.hasRole('SchoolUnionAdmin')}" === "true") { await this.initUnit(this.pageForm.unionId) } else { await this.initUnit("${@shiro.getPrincipalProperty('unit').getUnionid()}") diff --git a/src/main/resources/views/mobile/rxdj/auditList.html b/src/main/resources/views/mobile/rxdj/auditList.html index bcbc00b..f9cd271 100644 --- a/src/main/resources/views/mobile/rxdj/auditList.html +++ b/src/main/resources/views/mobile/rxdj/auditList.html @@ -14,7 +14,7 @@ layout("/mobile/platform.html"){ @@ -234,7 +234,7 @@ layout("/mobile/platform.html"){ }, async flushUnits() { if ( - "${@shiro.hasRole('sysadmin')||@shiro.hasRole('A06')||@shiro.hasRole('wyh03')||@shiro.hasRole('wyh02')||@shiro.hasRole('SchoolUnionMemberAdmin')}" === + "${@shiro.hasRole('sysadmin')||@shiro.hasRole('SchoolUnionAdmin')||@shiro.hasRole('wyh03')||@shiro.hasRole('wyh02')||@shiro.hasRole('SchoolUnionMemberAdmin')}" === "true" ) { await mCommon.getUnitList(this.pageForm.unionId) diff --git a/src/main/resources/views/mobile/wmhd/auditList.html b/src/main/resources/views/mobile/wmhd/auditList.html index 1f5dcc2..80ab910 100644 --- a/src/main/resources/views/mobile/wmhd/auditList.html +++ b/src/main/resources/views/mobile/wmhd/auditList.html @@ -13,7 +13,7 @@ layout("/mobile/platform.html"){ @@ -105,7 +105,7 @@ layout("/mobile/platform.html"){ }, async flushUnits() { if ( - "${@shiro.hasRole('sysadmin')||@shiro.hasRole('A06')||@shiro.hasRole('wyh03')||@shiro.hasRole('wyh02')||@shiro.hasRole('SchoolUnionMemberAdmin')}" === + "${@shiro.hasRole('sysadmin')||@shiro.hasRole('SchoolUnionAdmin')||@shiro.hasRole('wyh03')||@shiro.hasRole('wyh02')||@shiro.hasRole('SchoolUnionMemberAdmin')}" === "true" ) { await mCommon.getUnitList(this.pageForm.unionId) diff --git a/src/main/resources/views/mobile/zc/zcPd.html b/src/main/resources/views/mobile/zc/zcPd.html index 733de64..6184b63 100644 --- a/src/main/resources/views/mobile/zc/zcPd.html +++ b/src/main/resources/views/mobile/zc/zcPd.html @@ -555,7 +555,7 @@ layout("/mobile/platform.html"){ async userRemoteMethod(event) { if (event) { let arr = [] - if ("${@shiro.hasRole('sysadmin')||@shiro.hasRole('A06')}") { + if ("${@shiro.hasRole('sysadmin')||@shiro.hasRole('SchoolUnionAdmin')}") { arr = await searchUser(event, null, null, null, null) } else { arr = await searchUser(event, "${@shiro.getPrincipalProperty('unit').getUnionid()}", null, null, null) @@ -577,7 +577,7 @@ layout("/mobile/platform.html"){ async lyrRemoteMethod(event) { if (event) { let arr = [] - if ("${@shiro.hasRole('sysadmin')||@shiro.hasRole('A06')}") { + if ("${@shiro.hasRole('sysadmin')||@shiro.hasRole('SchoolUnionAdmin')}") { arr = await searchUser(event, null, null, null, null) } else { arr = await searchUser(event, "${@shiro.getPrincipalProperty('unit').getUnionid()}", null, null, null) diff --git a/src/main/resources/views/platform/activity/basic/ActivityScope.html b/src/main/resources/views/platform/activity/basic/ActivityScope.html index 029b3d7..c48fcbb 100644 --- a/src/main/resources/views/platform/activity/basic/ActivityScope.html +++ b/src/main/resources/views/platform/activity/basic/ActivityScope.html @@ -61,7 +61,7 @@ layout("/layouts/platform.html"){ return { /* userList: [], is_H04: "${@shiro.hasRole('H04')}" === 'true', - is_A06: "${@shiro.hasRole('A06')}" === 'true', + is_A06: "${@shiro.hasRole('SchoolUnionAdmin')}" === 'true', is_H10: "${@shiro.hasRole('H10')}" === 'true', is_H02: "${@shiro.hasRole('club01')}" === 'true', is_sysadmin: "${@shiro.hasRole('sysadmin')}" === 'true', @@ -169,7 +169,7 @@ layout("/layouts/platform.html"){ }, async flushUnits() { this.$set(this.pageForm, "unitId", "") - if ("${@shiro.hasRole('sysadmin')||@shiro.hasRole('A06')||@shiro.hasRole('H03')}" === 'true') { + if ("${@shiro.hasRole('sysadmin')||@shiro.hasRole('SchoolUnionAdmin')||@shiro.hasRole('H03')}" === 'true') { this.units = await getUnits(this.pageForm.unionId) this.activityUnits = await getActivityUnits(this.pageForm.activityUnionId) } else { @@ -282,7 +282,7 @@ layout("/layouts/platform.html"){ }, async created() { /* this.clubOptions = await getClubsByRole() - if ("${@shiro.hasRole('sysadmin')||@shiro.hasRole('A06')||@shiro.hasRole('club01')}" === 'false' && "${@shiro.hasRole('H04')}" === 'true') { + if ("${@shiro.hasRole('sysadmin')||@shiro.hasRole('SchoolUnionAdmin')||@shiro.hasRole('club01')}" === 'false' && "${@shiro.hasRole('H04')}" === 'true') { this.unions = await getUnionList("${@shiro.getPrincipalProperty('unit').getUnionid()}") this.$set(this.pageForm, "unionId", this.unions[0].id) } else { diff --git a/src/main/resources/views/platform/activity/basic/ActivityUser.html b/src/main/resources/views/platform/activity/basic/ActivityUser.html index 276b12e..400d66d 100644 --- a/src/main/resources/views/platform/activity/basic/ActivityUser.html +++ b/src/main/resources/views/platform/activity/basic/ActivityUser.html @@ -53,7 +53,7 @@ layout("/layouts/platform.html"){
+ v-if="${@shiro.hasRole('sysadmin')||@shiro.hasRole('SchoolUnionAdmin')||@shiro.hasRole('H03')}">
所属工会：