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
2e326f0f
Commit
2e326f0f
authored
Jul 19, 2022
by
zhangsen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改bug
parent
42e98d7d
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
1 deletion
+13
-1
OrgMenuDto.java
...m/yeejoin/amos/boot/module/common/api/dto/OrgMenuDto.java
+12
-0
OrgUsrServiceImpl.java
...oot/module/common/biz/service/impl/OrgUsrServiceImpl.java
+1
-1
No files found.
amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/OrgMenuDto.java
View file @
2e326f0f
...
...
@@ -28,6 +28,7 @@ public class OrgMenuDto {
private
String
bizOrgType
;
private
String
bizOrgCode
;
private
Long
total
;
private
String
code
;
public
Boolean
getLeaf
()
{
return
ObjectUtils
.
isEmpty
(
children
);
...
...
@@ -45,6 +46,17 @@ public class OrgMenuDto {
return
title
;
}
public
OrgMenuDto
(
Long
key
,
String
title
,
Long
parentId
,
String
bizOrgType
,
boolean
leaf
,
String
bizOrgCode
,
String
code
)
{
super
();
this
.
key
=
key
;
this
.
title
=
title
;
this
.
parentId
=
parentId
;
this
.
bizOrgType
=
bizOrgType
;
this
.
leaf
=
leaf
;
this
.
bizOrgCode
=
bizOrgCode
;
this
.
code
=
code
;
}
public
OrgMenuDto
(
Long
key
,
String
title
,
Long
parentId
,
String
bizOrgType
,
boolean
leaf
,
String
bizOrgCode
)
{
super
();
this
.
key
=
key
;
...
...
amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/OrgUsrServiceImpl.java
View file @
2e326f0f
...
...
@@ -164,7 +164,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
List
<
OrgMenuDto
>
menuList
=
list
.
stream
()
.
map
(
o
->
new
OrgMenuDto
(
o
.
getSequenceNbr
(),
o
.
getBizOrgName
(),
ObjectUtils
.
isEmpty
(
o
.
getParentId
())
?
0L
:
Long
.
parseLong
(
o
.
getParentId
()),
o
.
getBizOrgType
(),
false
,
o
.
getBizOrgCode
()).
setTotal
(
o
.
getTotal
()))
false
,
o
.
getBizOrgCode
()
,
o
.
getCode
()
).
setTotal
(
o
.
getTotal
()))
.
collect
(
Collectors
.
toList
());
List
<
OrgMenuDto
>
result
=
new
ArrayList
<>();
Map
<
Long
,
OrgMenuDto
>
map
=
new
HashMap
<>(
menuList
.
size
());
...
...
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