From 39559979742ebf0daed7115266a5cd27bebc76a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Sun, 19 Nov 2023 23:21:28 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B0=86=E6=8C=89=E9=92=AE=E7=9A=84=E7=BC=93?=
 =?UTF-8?q?=E5=AD=98=E4=BB=8E=E7=99=BB=E5=BD=95=E9=80=BB=E8=BE=91=E6=8C=AA?=
 =?UTF-8?q?=E5=88=B0=E7=99=BB=E5=BD=95=E4=B9=8B=E5=90=8E=E7=9A=84=E7=95=8C?=
 =?UTF-8?q?=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jshERP-web/src/api/api.js                       | 2 ++
 jshERP-web/src/components/page/GlobalHeader.vue | 9 +++++++--
 jshERP-web/src/views/user/Login.vue             | 1 -
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/jshERP-web/src/api/api.js b/jshERP-web/src/api/api.js
index 1419e479..57197a57 100644
--- a/jshERP-web/src/api/api.js
+++ b/jshERP-web/src/api/api.js
@@ -16,6 +16,7 @@ const registerUser = (params)=>postAction("/user/registerUser",params);
 const addUser = (params)=>postAction("/user/addUser",params);
 const editUser = (params)=>putAction("/user/updateUser",params);
 const getUserList = (params)=>getAction("/user/getUserList",params);
+const getUserBtnByCurrentUser = (params)=>getAction("/user/getUserBtnByCurrentUser",params);
 const queryPermissionsByUser = (params)=>postAction("/function/findMenuByPNumber",params);
 //机构管理
 const queryOrganizationTreeList = (params)=>getAction("/organization/getOrganizationTree",params);
@@ -121,6 +122,7 @@ export {
   addUser,
   editUser,
   getUserList,
+  getUserBtnByCurrentUser,
   queryPermissionsByUser,
   queryOrganizationTreeList,
   queryOrganizationById,
diff --git a/jshERP-web/src/components/page/GlobalHeader.vue b/jshERP-web/src/components/page/GlobalHeader.vue
index 40613768..6f9321f3 100644
--- a/jshERP-web/src/components/page/GlobalHeader.vue
+++ b/jshERP-web/src/components/page/GlobalHeader.vue
@@ -45,9 +45,9 @@
   import UserMenu from '../tools/UserMenu'
   import SMenu from '../menu/'
   import Logo from '../tools/Logo'
-  import { getCurrentSystemConfig } from '@/api/api'
-
+  import { getCurrentSystemConfig, getUserBtnByCurrentUser } from '@/api/api'
   import { mixin } from '@/utils/mixin.js'
+  import Vue from 'vue'
 
   export default {
     name: 'GlobalHeader',
@@ -166,6 +166,11 @@
             this.companyName = res.data.companyName
           }
         })
+        getUserBtnByCurrentUser().then((res) => {
+          if(res.code === 200 && res.data){
+            Vue.ls.set('winBtnStrList', res.data.userBtn, 7 * 24 * 60 * 60 * 1000)
+          }
+        })
       },
       //update-begin--author:sunjianlei---date:20190508------for: 顶部导航栏过长时显示更多按钮-----
     }
diff --git a/jshERP-web/src/views/user/Login.vue b/jshERP-web/src/views/user/Login.vue
index 4b34220c..a8464fc5 100644
--- a/jshERP-web/src/views/user/Login.vue
+++ b/jshERP-web/src/views/user/Login.vue
@@ -247,7 +247,6 @@
         if(res.code==200){
           let err = {};
           if(res.data.msgTip == 'user can login'){
-            Vue.ls.set('winBtnStrList', res.data.userBtn, 7 * 24 * 60 * 60 * 1000);
             this.loginSuccess(res)
           } else if(res.data.msgTip == 'user is not exist'){
             err.message = '用户不存在';