Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
A
AmosBankRoot
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
bank
AmosBankRoot
Commits
6ab4d9c7
Commit
6ab4d9c7
authored
Jun 09, 2020
by
zhengjiangtao
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改金融城和私有云支持动环和科技处
parent
549d2fac
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
3 deletions
+3
-3
TopographyController.java
...om/yeejoin/amos/bank/controller/TopographyController.java
+3
-3
No files found.
AmosBankService/src/main/java/com/yeejoin/amos/bank/controller/TopographyController.java
View file @
6ab4d9c7
...
@@ -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
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment