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
124397e2
Commit
124397e2
authored
Dec 01, 2021
by
chenhao
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改获取消防队伍中树信息展示没有数据的问题
parent
a28664c7
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
2 deletions
+7
-2
TreeParser.java
...va/com/yeejoin/amos/boot/biz/common/utils/TreeParser.java
+1
-1
FireTeamServiceImpl.java
...boot/module/jcs/biz/service/impl/FireTeamServiceImpl.java
+6
-1
No files found.
amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/utils/TreeParser.java
View file @
124397e2
...
@@ -67,7 +67,7 @@ public class TreeParser {
...
@@ -67,7 +67,7 @@ public class TreeParser {
parentId
=
PARENTIDMethodNameme
.
invoke
(
entity
)
!=
null
?
Long
.
valueOf
(
String
.
valueOf
(
PARENTIDMethodNameme
.
invoke
(
entity
)))
:
null
;
parentId
=
PARENTIDMethodNameme
.
invoke
(
entity
)
!=
null
?
Long
.
valueOf
(
String
.
valueOf
(
PARENTIDMethodNameme
.
invoke
(
entity
)))
:
null
;
if
(
parentId
==
null
||
topId
==
parentId
)
{
if
(
parentId
==
null
||
topId
.
equals
(
parentId
)
)
{
//陈浩2021-12-01修改 topId == parentId 的判断
String
codeString
=
String
.
valueOf
(
IDMethodNameme
.
invoke
(
entity
));
String
codeString
=
String
.
valueOf
(
IDMethodNameme
.
invoke
(
entity
));
Integer
num
=
0
;
Integer
num
=
0
;
if
(
list
!=
null
&&
list
.
size
()
>
0
)
{
if
(
list
!=
null
&&
list
.
size
()
>
0
)
{
...
...
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 @
124397e2
...
@@ -468,7 +468,12 @@ public List<Menu> getFirstTeamToDesignatedDepartment(String dicCode, String type
...
@@ -468,7 +468,12 @@ public List<Menu> getFirstTeamToDesignatedDepartment(String dicCode, String type
queryWrapper
.
eq
(
FireTeam:
:
getTypeCode
,
code
);
queryWrapper
.
eq
(
FireTeam:
:
getTypeCode
,
code
);
queryWrapper
.
eq
(
FireTeam:
:
getIsDelete
,
false
);
queryWrapper
.
eq
(
FireTeam:
:
getIsDelete
,
false
);
queryWrapper
.
eq
(
FireTeam:
:
getCompanyName
,
"消防救援保障部"
);
queryWrapper
.
eq
(
FireTeam:
:
getCompanyName
,
"消防救援保障部"
);
return
TreeParser
.
getTree
(
null
,
this
.
baseMapper
.
selectList
(
queryWrapper
),
FireTeam
.
class
.
getName
(),
"getSequenceNbr"
,
2
,
"getName"
,
"getParent"
,
LambdaQueryWrapper
<
FireTeam
>
queryWrapper1
=
new
LambdaQueryWrapper
<
FireTeam
>();
queryWrapper1
.
eq
(
FireTeam:
:
getIsDelete
,
false
);
queryWrapper1
.
eq
(
FireTeam:
:
getCompanyName
,
"消防救援保障部"
);
queryWrapper1
.
isNull
(
FireTeam:
:
getParent
);
FireTeam
parentFireTeam
=
this
.
baseMapper
.
selectOne
(
queryWrapper1
);
return
TreeParser
.
getTree
(
parentFireTeam
.
getSequenceNbr
()
,
this
.
baseMapper
.
selectList
(
queryWrapper
),
FireTeam
.
class
.
getName
(),
"getSequenceNbr"
,
2
,
"getName"
,
"getParent"
,
null
);
null
);
// TODO Auto-generated method stub
// TODO Auto-generated method stub
}
}
...
...
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