diff --git a/src/api/ajax.js b/src/api/ajax.js index fe3232a8..c189b101 100644 --- a/src/api/ajax.js +++ b/src/api/ajax.js @@ -50,9 +50,10 @@ const formRequest=axios.create({ return res.data }else{ if(code === 401){ - store.dispatch('LogOut').then(() => { - location.href = this.webBaseUrl + ReLoginUrl; - }) + //Message({message: msg, type: 'error'}); + store.dispatch('LogOut').then(() => { + location.href = this.webBaseUrl + ReLoginUrl; + }) }else if(code===403){ var msg='当前操作没有权限'; Message({message: msg, type: 'error'}); diff --git a/src/api/boe/userbasic.js b/src/api/boe/userbasic.js index 27f679e5..1c825246 100644 --- a/src/api/boe/userbasic.js +++ b/src/api/boe/userbasic.js @@ -23,6 +23,10 @@ const findOrgTreeByOrgId = function(orgId) { return ajax.postJson(baseURL,'/org/childOrgs',{orgId}); } +const getOrgInfo = function(orgId) { + return ajax.postJson(baseURL,'/org/info',{orgId}); +} + /**根据用户id获取用户的信息*/ const getUserInfoById = function(id) { return ajax.postJson(baseURL,'/user/list',{id}); @@ -47,6 +51,7 @@ const getOrgHrbpInfo = function(orgId) { export default { userParentOrg, findOrgsByKeyword, + getOrgInfo, findOrgTreeByOrgId, getUserInfoById, getUserCrowds, diff --git a/src/components/System/chooseOrg.vue b/src/components/System/chooseOrg.vue index 80c41006..2b553706 100644 --- a/src/components/System/chooseOrg.vue +++ b/src/components/System/chooseOrg.vue @@ -122,20 +122,17 @@ }); }else{ parentId = node.data.id; - apiUserBasic.findOrgTreeByOrgId(parentId).then(rs=>{ + apiUserBasic.getOrgInfo(parentId).then(rs=>{ if(rs.status==200){ let treeList=[]; - if(rs.result.length>0 && rs.result[0].treeChildList){ - rs.result[0].treeChildList.forEach(item=>{ + if(rs.result.directChildList){ + rs.result.directChildList.forEach(item=>{ let node={ id:item.id, name:item.name, hrbpId:item.hrbpId, children:[] } - if(item.treeChildList){ - $this.readTreeNode(node,item.treeChildList); - } treeList.push(node); }); } @@ -144,6 +141,28 @@ resolve([]); } }); + // apiUserBasic.findOrgTreeByOrgId(parentId).then(rs=>{ + // if(rs.status==200){ + // let treeList=[]; + // if(rs.result.length>0 && rs.result[0].treeChildList){ + // rs.result[0].treeChildList.forEach(item=>{ + // let node={ + // id:item.id, + // name:item.name, + // hrbpId:item.hrbpId, + // children:[] + // } + // if(item.treeChildList){ + // $this.readTreeNode(node,item.treeChildList); + // } + // treeList.push(node); + // }); + // } + // resolve(treeList); + // }else{ + // resolve([]); + // } + // }); } // usergroupApi.userOrgs(parentId).then(res =>{ // if (res.status == 200) {