Commit 6ab4d9c7 authored by zhengjiangtao's avatar zhengjiangtao

修改金融城和私有云支持动环和科技处

parent 549d2fac
...@@ -390,7 +390,7 @@ public class TopographyController extends BaseController { ...@@ -390,7 +390,7 @@ public class TopographyController extends BaseController {
@PathVariable int type) { @PathVariable int type) {
//获取当前登录人的公司code //获取当前登录人的公司code
ReginParams reginParams =getSelectedOrgInfo(); ReginParams reginParams =getSelectedOrgInfo();
List<TopographyTreeDTO> list = topographyService.getTree(reginParams.getCompany().getOrgCode(), type); List<TopographyTreeDTO> list = topographyService.getTree("%#"+reginParams.getCompany().getOrgCode(), type);
return CommonResponseUtil.success(list); return CommonResponseUtil.success(list);
} }
...@@ -406,8 +406,8 @@ public class TopographyController extends BaseController { ...@@ -406,8 +406,8 @@ public class TopographyController extends BaseController {
@ApiParam(value = "树id", required = false) @PathVariable String treeId) { @ApiParam(value = "树id", required = false) @PathVariable String treeId) {
//获取当前登录人的公司code //获取当前登录人的公司code
ReginParams reginParams =getSelectedOrgInfo(); ReginParams reginParams =getSelectedOrgInfo();
List<TopographyNodeDTO> nodes = topographyService.getNodes("%#"+reginParams.getCompany().getOrgCode(),treeId,type); List<TopographyNodeDTO> nodes = topographyService.getNodes("%#" + reginParams.getCompany().getOrgCode(),treeId,type);
List<TopographyLineDTO> links = topographyService.getLinks(reginParams.getCompany().getOrgCode(),treeId,type); List<TopographyLineDTO> links = topographyService.getLinks("%#" + reginParams.getCompany().getOrgCode(),treeId,type);
Map<String,Object> results = new HashMap<>(); Map<String,Object> results = new HashMap<>();
results.put("nodeData", nodes); results.put("nodeData", nodes);
results.put("linkData", links); results.put("linkData", links);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment