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
20a6cde6
Commit
20a6cde6
authored
Aug 19, 2021
by
chenhao
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
update bug
parent
f1f3e0d1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
2 deletions
+4
-2
FireTeamServiceImpl.java
...boot/module/jcs/biz/service/impl/FireTeamServiceImpl.java
+3
-1
application.properties
...boot-system-jcs/src/main/resources/application.properties
+1
-1
No files found.
amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/FireTeamServiceImpl.java
View file @
20a6cde6
...
...
@@ -135,7 +135,9 @@ public class FireTeamServiceImpl extends BaseService<FireTeamDto, FireTeam, Fire
public
List
<
MenuFrom
>
getCompanyTeamTree
()
throws
Exception
{
MenuFrom
root
=
new
MenuFrom
(
"-1"
,
"消防队伍"
,
null
,
null
);
// 机场单位
List
<
OrgUsr
>
companyDeptList
=
orgUsrService
.
selectCompanyDepartmentMsg
();
//bug:2457需求要求不显示部门,因此更换方法 by 陈浩 2021-08-18
// List<OrgUsr> companyDeptList = orgUsrService.selectCompanyDepartmentMsg();
List
<
OrgUsr
>
companyDeptList
=
orgUsrService
.
selectCompanyList
();
List
<
MenuFrom
>
companyDeptMenuList
=
Lists
.
newArrayList
();
companyDeptList
.
forEach
(
o
->
{
if
(
ValidationUtil
.
isEmpty
(
o
.
getParentId
()))
{
...
...
amos-boot-system-jcs/src/main/resources/application.properties
View file @
20a6cde6
spring.application.name
=
JCS
spring.application.name
=
JCS
_chenhao
server.servlet.context-path
=
/jcs
server.port
=
11100
spring.profiles.active
=
dev
...
...
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