|
|
@ -100,16 +100,16 @@ public class HrServiceImpl implements HrService { |
|
|
public Tree getOrgAndManTree() { |
|
|
public Tree getOrgAndManTree() { |
|
|
|
|
|
|
|
|
//先从redis里查一下看看有没有有则直接返回
|
|
|
//先从redis里查一下看看有没有有则直接返回
|
|
|
if(redisTemplate.hasKey("orgTree_0_313")){ |
|
|
if(redisTemplate.hasKey("orgTree_313_309")){ |
|
|
String orgTreeStr = redisTemplate.opsForValue().get("orgTree_0_313").toString(); |
|
|
String orgTreeStr = redisTemplate.opsForValue().get("orgTree_313_309").toString(); |
|
|
Tree o = JSON.parseObject(orgTreeStr, Tree.class); |
|
|
Tree o = JSON.parseObject(orgTreeStr, Tree.class); |
|
|
return o; |
|
|
return o; |
|
|
}else{ |
|
|
}else{ |
|
|
ArrayList<OrgContType> allWsList = new ArrayList(); |
|
|
ArrayList<OrgContType> allWsList = new ArrayList(); |
|
|
ArrayList<Tree> treeList = new ArrayList(); |
|
|
ArrayList<Tree> treeList = new ArrayList(); |
|
|
Long adminorg = 0L;//恒信集团
|
|
|
//Long adminorg = 0L;//恒信集团
|
|
|
//Long adminorg = 309L;//高科企管部
|
|
|
//Long adminorg = 309L;//高科企管部
|
|
|
//Long adminorg = 312L;//高科
|
|
|
Long adminorg = 312L;//高科
|
|
|
|
|
|
|
|
|
OrgContType orgContType = queryOrgContTypeByAdminorg(adminorg); |
|
|
OrgContType orgContType = queryOrgContTypeByAdminorg(adminorg); |
|
|
findAllUnder(orgContType,allWsList); |
|
|
findAllUnder(orgContType,allWsList); |
|
|
@ -139,12 +139,12 @@ public class HrServiceImpl implements HrService { |
|
|
recursionListToTree(treeList,pid); |
|
|
recursionListToTree(treeList,pid); |
|
|
} |
|
|
} |
|
|
for (Tree dept : treeList) { |
|
|
for (Tree dept : treeList) { |
|
|
if(dept.getId().equals("313")){//309高科 102企管 313集团
|
|
|
if(dept.getId().equals("309")){//309高科 102企管 313集团
|
|
|
tree = dept; |
|
|
tree = dept; |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
String orgAndManTree_Json= JSON.toJSONString(tree); |
|
|
String orgAndManTree_Json= JSON.toJSONString(tree); |
|
|
redisTemplate.opsForValue().set("orgTree_0_313", orgAndManTree_Json, 1, TimeUnit.DAYS); |
|
|
redisTemplate.opsForValue().set("orgTree_313_309", orgAndManTree_Json, 1, TimeUnit.DAYS); |
|
|
return tree; |
|
|
return tree; |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
|