Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
A
amos-boot-biz
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
0
Merge Requests
0
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
项目统一框架
amos-boot-biz
Commits
0472be9c
Commit
0472be9c
authored
Dec 08, 2022
by
tianyiming
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改bug
parent
2b3c072b
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
3 deletions
+5
-3
FireFightingSystemController.java
.../equipmanage/controller/FireFightingSystemController.java
+1
-1
IFireFightingSystemService.java
...ejoin/equipmanage/service/IFireFightingSystemService.java
+1
-1
FireFightingSystemServiceImpl.java
...uipmanage/service/impl/FireFightingSystemServiceImpl.java
+3
-1
No files found.
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/FireFightingSystemController.java
View file @
0472be9c
...
...
@@ -832,7 +832,7 @@ public class FireFightingSystemController extends AbstractBaseController {
@ApiOperation
(
httpMethod
=
"GET"
,
value
=
"获取系统分类树"
,
notes
=
"获取系统分类树"
)
@GetMapping
(
value
=
"/systemAndEquipmentTreeByBziOrgCode"
)
public
List
<
OrgMenuDto
>
systemAndEquipmentTreeByBziOrgCode
()
{
return
fireFightingSystemService
.
systemAndEquipmentTreeByBziOrgCode
(
bizOrgCode
);
return
fireFightingSystemService
.
systemAndEquipmentTreeByBziOrgCode
();
}
/**
...
...
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/IFireFightingSystemService.java
View file @
0472be9c
...
...
@@ -284,7 +284,7 @@ public interface IFireFightingSystemService extends IService<FireFightingSystemE
Page
<
Map
<
String
,
Object
>>
getSystemInfo
(
Page
page
,
String
companyCode
,
String
systemCode
);
List
<
OrgMenuDto
>
systemAndEquipmentTreeByBziOrgCode
(
String
bizOrgCode
);
List
<
OrgMenuDto
>
systemAndEquipmentTreeByBziOrgCode
();
Map
<
String
,
Object
>
getSystemDetailByCode
(
String
systemCode
);
...
...
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/FireFightingSystemServiceImpl.java
View file @
0472be9c
...
...
@@ -1991,7 +1991,9 @@ public class FireFightingSystemServiceImpl extends ServiceImpl<FireFightingSyste
}
@Override
public
List
<
OrgMenuDto
>
systemAndEquipmentTreeByBziOrgCode
(
String
bizOrgCode
)
{
public
List
<
OrgMenuDto
>
systemAndEquipmentTreeByBziOrgCode
()
{
FeignClientResult
<
List
<
OrgUsrDto
>>
feignClientResult
=
jcsFeignClient
.
getCompanyDeptListWithAuth
(
authKey
,
"COMPANY"
,
"dl"
);
String
bizOrgCode
=
feignClientResult
.
getResult
().
get
(
0
).
getBizOrgCode
();
List
<
Map
<
String
,
Object
>>
list
=
fireFightingSystemMapper
.
systemAndEquipment
(
bizOrgCode
);
return
systemAndEquipmentTree
(
list
);
}
...
...
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