下级机构查询换成info接口

This commit is contained in:
daihh
2022-11-30 17:38:26 +08:00
parent 713fab9ca5
commit 286a9a60af
3 changed files with 34 additions and 9 deletions

View File

@@ -50,9 +50,10 @@ const formRequest=axios.create({
return res.data return res.data
}else{ }else{
if(code === 401){ if(code === 401){
store.dispatch('LogOut').then(() => { //Message({message: msg, type: 'error'});
location.href = this.webBaseUrl + ReLoginUrl; store.dispatch('LogOut').then(() => {
}) location.href = this.webBaseUrl + ReLoginUrl;
})
}else if(code===403){ }else if(code===403){
var msg='当前操作没有权限'; var msg='当前操作没有权限';
Message({message: msg, type: 'error'}); Message({message: msg, type: 'error'});

View File

@@ -23,6 +23,10 @@ const findOrgTreeByOrgId = function(orgId) {
return ajax.postJson(baseURL,'/org/childOrgs',{orgId}); return ajax.postJson(baseURL,'/org/childOrgs',{orgId});
} }
const getOrgInfo = function(orgId) {
return ajax.postJson(baseURL,'/org/info',{orgId});
}
/**根据用户id获取用户的信息*/ /**根据用户id获取用户的信息*/
const getUserInfoById = function(id) { const getUserInfoById = function(id) {
return ajax.postJson(baseURL,'/user/list',{id}); return ajax.postJson(baseURL,'/user/list',{id});
@@ -47,6 +51,7 @@ const getOrgHrbpInfo = function(orgId) {
export default { export default {
userParentOrg, userParentOrg,
findOrgsByKeyword, findOrgsByKeyword,
getOrgInfo,
findOrgTreeByOrgId, findOrgTreeByOrgId,
getUserInfoById, getUserInfoById,
getUserCrowds, getUserCrowds,

View File

@@ -122,20 +122,17 @@
}); });
}else{ }else{
parentId = node.data.id; parentId = node.data.id;
apiUserBasic.findOrgTreeByOrgId(parentId).then(rs=>{ apiUserBasic.getOrgInfo(parentId).then(rs=>{
if(rs.status==200){ if(rs.status==200){
let treeList=[]; let treeList=[];
if(rs.result.length>0 && rs.result[0].treeChildList){ if(rs.result.directChildList){
rs.result[0].treeChildList.forEach(item=>{ rs.result.directChildList.forEach(item=>{
let node={ let node={
id:item.id, id:item.id,
name:item.name, name:item.name,
hrbpId:item.hrbpId, hrbpId:item.hrbpId,
children:[] children:[]
} }
if(item.treeChildList){
$this.readTreeNode(node,item.treeChildList);
}
treeList.push(node); treeList.push(node);
}); });
} }
@@ -144,6 +141,28 @@
resolve([]); 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 =>{ // usergroupApi.userOrgs(parentId).then(res =>{
// if (res.status == 200) { // if (res.status == 200) {