Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
H
haoban-manage3.0
Overview
Overview
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
haoban3.0
haoban-manage3.0
Commits
f3a7c35e
Commit
f3a7c35e
authored
Mar 31, 2023
by
songyinghui
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'feature-content2' of git.gicdev.com:haoban3.0/haoban-manage3.0 into feature-content2
parents
6c49d1db
2ae39b4a
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 additions
and
6 deletions
+1
-6
RightController.java
...com/gic/haoban/manage/web/controller/RightController.java
+1
-6
No files found.
haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/RightController.java
View file @
f3a7c35e
...
@@ -74,12 +74,7 @@ public class RightController extends WebBaseController {
...
@@ -74,12 +74,7 @@ public class RightController extends WebBaseController {
}
}
ServiceResponse
<
Map
<
String
,
Object
>>
resp
=
this
.
rightService
.
listHaobanAllMenu
(
enterpriseId
,
clerkId
);
ServiceResponse
<
Map
<
String
,
Object
>>
resp
=
this
.
rightService
.
listHaobanAllMenu
(
enterpriseId
,
clerkId
);
if
(
resp
.
isSuccess
())
{
if
(
resp
.
isSuccess
())
{
List
<
RightMenuDTO
>
gicMenuList
=
rightService
.
listGicMenuByMenuCode
(
enterpriseId
,
clerkId
,
Lists
.
newArrayList
(
"content_center"
));
return
resultResponse
(
HaoBanErrCode
.
ERR_1
,
resp
.
getResult
());
Map
<
String
,
Object
>
result
=
resp
.
getResult
();
List
<
RightMenuDTO
>
menuList
=
(
List
<
RightMenuDTO
>)
result
.
get
(
"menu"
);
menuList
.
addAll
(
gicMenuList
);
result
.
put
(
"menu"
,
menuList
);
return
resultResponse
(
HaoBanErrCode
.
ERR_1
,
result
);
}
}
return
resultResponse
(
HaoBanErrCode
.
ERR_OTHER
,
resp
.
getMessage
());
return
resultResponse
(
HaoBanErrCode
.
ERR_OTHER
,
resp
.
getMessage
());
}
}
...
...
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