修改密码更新逻辑.

orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/framework/service/impl/SecurityFrameworkServiceImpl.java

@@ -36,6 +36,12 @@ public class SecurityFrameworkServiceImpl implements SecurityFrameworkService {
         return permissionService.hasPermission(permission);
     }
 
+    @Override
+    public boolean hasAnyPermission(String... permissions) {
+        // 检查是否有权限
+        return permissionService.hasAnyPermission(permissions);
+    }
+
     @Override
     public boolean hasRole(String role) {
         // 检查是否有角色

orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/service/PermissionService.java

@@ -59,6 +59,14 @@ public interface PermissionService {
      */
     boolean hasPermission(String permission);
 
+    /**
+     * 检查当前用户是否含任意权限 (有效性判断)
+     *
+     * @param permissions permissions
+     * @return 是否包含
+     */
+    boolean hasAnyPermission(String... permissions);
+
     /**
      * 获取用户菜单
      *

orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/service/impl/PermissionServiceImpl.java

@@ -1,5 +1,6 @@
 package com.orion.ops.module.infra.service.impl;
 
+import com.orion.lang.utils.Arrays1;
 import com.orion.lang.utils.collect.Lists;
 import com.orion.ops.framework.common.constant.Const;
 import com.orion.ops.framework.common.security.LoginUser;
@@ -129,17 +130,25 @@ public class PermissionServiceImpl implements PermissionService {
             return true;
         }
         // 检查普通角色是否有此权限
-        for (String role : roles) {
-            // 获取角色权限列表
-            List<SystemMenuCacheDTO> menus = roleMenuCache.get(role);
-            if (Lists.isEmpty(menus)) {
-                continue;
-            }
-            boolean has = menus.stream()
-                    .filter(s -> MenuStatusEnum.ENABLED.getStatus().equals(s.getStatus()))
-                    .map(SystemMenuCacheDTO::getPermission)
-                    .filter(Objects::nonNull)
-                    .anyMatch(permission::equals);
+        return roles.stream().anyMatch(s -> this.checkRoleHasPermission(s, permission));
+    }
+
+    @Override
+    public boolean hasAnyPermission(String... permissions) {
+        if (Arrays1.isEmpty(permissions)) {
+            return true;
+        }
+        // 获取用户角色
+        List<String> roles = this.getUserEnabledRoles();
+        if (roles.isEmpty()) {
+            return false;
+        }
+        // 检查是否为超级管理员
+        if (RoleDefine.containsAdmin(roles)) {
+            return true;
+        }
+        for (String permission : permissions) {
+            final boolean has = roles.stream().anyMatch(s -> this.checkRoleHasPermission(s, permission));
             if (has) {
                 return true;
             }
@@ -212,6 +221,27 @@ public class PermissionServiceImpl implements PermissionService {
                 .build();
     }
 
+    /**
+     * 检查角色是否有权限
+     *
+     * @param role       role
+     * @param permission permission
+     * @return 是否有权限
+     */
+    private boolean checkRoleHasPermission(String role, String permission) {
+        // 获取角色权限列表
+        List<SystemMenuCacheDTO> menus = roleMenuCache.get(role);
+        if (Lists.isEmpty(menus)) {
+            return false;
+        }
+        // 检查是否有此权限
+        return menus.stream()
+                .filter(s -> MenuStatusEnum.ENABLED.getStatus().equals(s.getStatus()))
+                .map(SystemMenuCacheDTO::getPermission)
+                .filter(Objects::nonNull)
+                .anyMatch(permission::equals);
+    }
+
     /**
      * 获取用户启用的角色
      *