修复2.0权限问题

src/pages/Authorized.js

@@ -1,21 +1,22 @@
 import React from 'react';
 import RenderAuthorized from '@/components/Authorized';
 import Exception from '@/components/Exception';
+import { getAuthority } from '@/utils/authority';
 import { matchRoutes } from 'react-router-config';
-import uniq from 'lodash/uniq';
+import intersection from 'lodash/intersection';
 import { formatMessage } from 'umi/locale';
 import Link from 'umi/link';
 
-const Authorized = RenderAuthorized(['admin', 'user']);
+const Authorized = RenderAuthorized(getAuthority());
 
 export default ({ children, route, location }) => {
   const routes = matchRoutes(route.routes, location.pathname);
   let authorities = [];
   routes.forEach(item => {
-    if (Array.isArray(item.route.authority)) {
+    if (Array.isArray(item.route.authority) && item.route.authority.length) {
-      authorities = authorities.concat(item.route.authority);
-    } else if (typeof item.route.authority === 'string') {
       authorities.push(item.route.authority);
+    } else if (typeof item.route.authority === 'string' && item.route.authority) {
+      authorities.push([item.route.authority]);
     }
   });
   const noMatch = (
@@ -28,7 +29,7 @@ export default ({ children, route, location }) => {
   );
   return (
     <Authorized
-      authority={authorities.length === 0 ? undefined : uniq(authorities)}
+      authority={authorities.length === 0 ? undefined : intersection(...authorities)}
       noMatch={noMatch}
     >
       {children}

src/utils/authority.js

@@ -6,7 +6,7 @@ export function getAuthority() {
     if (authority.includes('[')) {
       authority = JSON.parse(authority);
     } else {
-      authority = [authority];
+      authority = [JSON.parse(authority)];
     }
   } else {
     authority = ['admin'];