From f7e9b835c30e5b3287b2c04e24950871cafa907d Mon Sep 17 00:00:00 2001
From: liyj <1003249715@qq.com>
Date: Mon, 07 Sep 2020 15:28:45 +0800
Subject: [PATCH] Merge branch 'master' of http://120.79.193.119:9090/r/huge/frontEnd/hugeOA
---
src/module/login/login.jsx | 14 +++++++++++++-
1 files changed, 13 insertions(+), 1 deletions(-)
diff --git a/src/module/login/login.jsx b/src/module/login/login.jsx
index c8b24b2..ac1e7ad 100644
--- a/src/module/login/login.jsx
+++ b/src/module/login/login.jsx
@@ -68,6 +68,19 @@
}).then(res => {
console.log('res', res);
if (res) {
+ console.log('oa', res.map(({ symbol }) => (symbol)).concat(res.map(({ moduleSymbol }) => (moduleSymbol))).reduce((p, n) => {
+ if (p.indexOf(n) == -1) {
+ return p.concat(n)
+ } else {
+ return p
+ }
+ }, []), getMenuListByPermission(oaMenus, res && res.map(({ symbol }) => (symbol)).concat(res.map(({ moduleSymbol }) => (moduleSymbol))).reduce((p, n) => {
+ if (p.indexOf(n) == -1) {
+ return p.concat(n)
+ } else {
+ return p
+ }
+ }, [])), oaMenus)
window.localStorage.setItem('menu', JSON.stringify(res));
window.localStorage.setItem('menusListByRole', JSON.stringify({
user: { role: 'user', menus: userMenus },
@@ -84,7 +97,6 @@
message.success('登录成功');
console.log('this props', this.props);
history.push({ pathname: "/index" });
-
this.props.setContext && this.props.setContext({ role: 'oa' })
}
})
--
Gitblit v1.8.0