fix：角色赋权与同步交互上的优化 (#45)

opsre · Apr 25, 2023 · d97664f · d97664f
1 parent 32f83e4
commit d97664f
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 23 deletions.
diff --git a/src/permission.js b/src/permission.js
@@ -34,8 +34,8 @@ router.beforeEach(async(to, from, next) => {
         try {
           // get user info
           // note: roles must be a object array! such as: ['admin'] or ,['developer','editor']
-          const { id, roles } = await store.dispatch('user/getInfo')
-          const userinfo = { id: id, roles: roles }
+          const { ID, roles } = await store.dispatch('user/getInfo')
+          const userinfo = { id: ID, roles: roles }
           // generate accessible routes map based on roles
 
           const accessRoutes = await store.dispatch('permission/generateRoutes', userinfo)
@@ -49,7 +49,7 @@ router.beforeEach(async(to, from, next) => {
           next({ ...to, replace: true })
         } catch (error) {
           // remove token and go to login page to re-login
-         
+
           await store.dispatch('user/resetToken')
           Message.error(error || 'Has Error')
           next(`/login?redirect=${to.path}`)
@@ -59,7 +59,7 @@ router.beforeEach(async(to, from, next) => {
     }
   } else {
     /* has no token*/
-   
+
     if (whiteList.indexOf(to.path) !== -1) {
       //在免费登录白名单，直接去
       next()

diff --git a/src/store/modules/permission.js b/src/store/modules/permission.js
@@ -59,9 +59,9 @@ const actions = {
   generateRoutes({ commit }, userinfo) {
     return new Promise((resolve, reject) => {
       let accessedRoutes = []
-      const {roles}=userinfo
+      const {id, roles}=userinfo
       // 获取菜单树
-      getUserMenuTreeByUserId({id: roles[0].ID}).then(res => {
+      getUserMenuTreeByUserId({id: id}).then(res => {
 
         const { data } = res
         const menuTree = data

diff --git a/src/views/personnel/group/index.vue b/src/views/personnel/group/index.vue
@@ -468,7 +468,6 @@ export default {
         this.loading = false
         this.getTableData()
       })
-      this.loading = false
     },
     syncWeComDepts() {
       this.loading = true
@@ -477,7 +476,6 @@ export default {
         this.loading = false
         this.getTableData()
       })
-      this.loading = false
     },
     syncFeiShuDepts() {
       this.loading = true
@@ -486,7 +484,6 @@ export default {
         this.loading = false
         this.getTableData()
       })
-      this.loading = false
     },
     syncOpenLdapDepts() {
       this.loading = true
@@ -495,8 +492,7 @@ export default {
         this.loading = false
         this.getTableData()
       })
-      this.loading = false
-    },
+    }
   }
 }
 </script>

diff --git a/src/views/personnel/user/index.vue b/src/views/personnel/user/index.vue
@@ -720,38 +720,34 @@ export default {
     syncDingTalkUsers() {
       this.loading = true
       syncDingTalkUsersApi().then(res => {
-        this.loading = false
         this.judgeResult(res)
+        this.loading = false
+        this.getTableData()
       })
-      this.getTableData()
-      this.loading = false
     },
     syncWeComUsers() {
       this.loading = true
       syncWeComUsersApi().then(res => {
-        this.loading = false
         this.judgeResult(res)
+        this.loading = false
+        this.getTableData()
       })
-      this.getTableData()
-      this.loading = false
     },
     syncFeiShuUsers() {
       this.loading = true
       syncFeiShuUsersApi().then(res => {
-        this.loading = false
         this.judgeResult(res)
+        this.loading = false
+        this.getTableData()
       })
-      this.getTableData()
-      this.loading = false
     },
     syncOpenLdapUsers() {
       this.loading = true
       syncOpenLdapUsersApi().then(res => {
-        this.loading = false
         this.judgeResult(res)
+        this.loading = false
+        this.getTableData()
       })
-      this.getTableData()
-      this.loading = false
     }
   }
 }