Browse Source

1、添加豪生酒店运营部值班电话账号

dev_mz
v-lijf43 3 weeks ago
parent
commit
90f667ca72
  1. 2
      mh-common/src/main/java/com/mh/common/constant/Constants.java
  2. 2
      mh-common/src/main/java/com/mh/common/core/domain/entity/SysRole.java
  3. 2
      mh-common/src/main/java/com/mh/common/core/domain/entity/SysUser.java
  4. 6
      mh-common/src/main/java/com/mh/common/utils/SecurityUtils.java
  5. 4
      mh-framework/src/main/java/com/mh/framework/web/service/PermissionService.java

2
mh-common/src/main/java/com/mh/common/constant/Constants.java

@ -80,6 +80,8 @@ public class Constants {
*/ */
public static final String SUPER_ADMIN = "mhtech"; public static final String SUPER_ADMIN = "mhtech";
public static final String SUPER_ADMIN_TWO = "18675333710";
/** /**
* 角色权限分隔符 * 角色权限分隔符
*/ */

2
mh-common/src/main/java/com/mh/common/core/domain/entity/SysRole.java

@ -91,7 +91,7 @@ public class SysRole extends BaseEntity
public static boolean isAdmin(Long roleId) public static boolean isAdmin(Long roleId)
{ {
return roleId != null && 1L == roleId; return roleId != null && (1L == roleId || 10005L == roleId);
} }
@NotBlank(message = "角色名称不能为空") @NotBlank(message = "角色名称不能为空")

2
mh-common/src/main/java/com/mh/common/core/domain/entity/SysUser.java

@ -121,7 +121,7 @@ public class SysUser extends BaseEntity
public static boolean isAdmin(Long userId) public static boolean isAdmin(Long userId)
{ {
return userId != null && 1L == userId; return userId != null && (1L == userId || 10005L == userId);
} }
public Long getDeptId() public Long getDeptId()

6
mh-common/src/main/java/com/mh/common/utils/SecurityUtils.java

@ -102,7 +102,7 @@ public class SecurityUtils {
* @return 结果 * @return 结果
*/ */
public static boolean isAdmin(Long userId) { public static boolean isAdmin(Long userId) {
return userId != null && 1L == userId; return userId != null && (1L == userId ||10005L == userId);
} }
/** /**
@ -148,7 +148,9 @@ public class SecurityUtils {
*/ */
public static boolean hasRole(Collection<String> roles, String role) { public static boolean hasRole(Collection<String> roles, String role) {
return roles.stream().filter(StringUtils::hasText) return roles.stream().filter(StringUtils::hasText)
.anyMatch(x -> Constants.SUPER_ADMIN.equals(x) || PatternMatchUtils.simpleMatch(x, role)); .anyMatch(x -> Constants.SUPER_ADMIN.equals(x)
|| Constants.SUPER_ADMIN_TWO.equals(x)
|| PatternMatchUtils.simpleMatch(x, role));
} }
} }

4
mh-framework/src/main/java/com/mh/framework/web/service/PermissionService.java

@ -86,7 +86,9 @@ public class PermissionService {
} }
for (SysRole sysRole : loginUser.getUser().getRoles()) { for (SysRole sysRole : loginUser.getUser().getRoles()) {
String roleKey = sysRole.getRoleKey(); String roleKey = sysRole.getRoleKey();
if (Constants.SUPER_ADMIN.equals(roleKey) || roleKey.equals(StringUtils.trim(role))) { if (Constants.SUPER_ADMIN.equals(roleKey)
|| Constants.SUPER_ADMIN_TWO.equals(roleKey)
|| roleKey.equals(StringUtils.trim(role))) {
return true; return true;
} }
} }

Loading…
Cancel
Save