Merge remote-tracking branch 'origin/dev_New' into dev_New

liyong

6 天以前 dee56ed8d52f1d8ee1f89b369561c49e9b3b7c2d

 src/main/java/com/ruoyi/framework/security/service/SysPermissionService.java

@@ -70,7 +70,7 @@
                // 设置permissions属性，以便数据权限匹配权限

                for (SysRole role : roles)

                {

                    if (StringUtils.equals(role.getStatus(), UserConstants.ROLE_NORMAL))

                    if (StringUtils.equals(role.getStatus(), UserConstants.ROLE_NORMAL) && !role.isAdmin())

                    {

                        Set<String> rolePerms = menuService.selectMenuPermsByRoleId(role.getRoleId());

                        role.setPermissions(rolePerms);