Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
E
enterprise-platform
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
赵啸非
enterprise-platform
Commits
12e03368
Commit
12e03368
authored
Dec 12, 2024
by
廖旭伟
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
测试bug修改
parent
afba51b4
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
3 deletions
+3
-3
enterprise-manager/src/main/java/com/mortals/xhx/module/feedback/service/impl/FeedbackServiceImpl.java
...xhx/module/feedback/service/impl/FeedbackServiceImpl.java
+1
-0
enterprise-manager/src/main/java/com/mortals/xhx/module/feedback/web/FeedbackController.java
...m/mortals/xhx/module/feedback/web/FeedbackController.java
+1
-1
enterprise-manager/src/main/java/com/mortals/xhx/module/news/web/NewsController.java
.../java/com/mortals/xhx/module/news/web/NewsController.java
+1
-2
No files found.
enterprise-manager/src/main/java/com/mortals/xhx/module/feedback/service/impl/FeedbackServiceImpl.java
View file @
12e03368
...
...
@@ -59,6 +59,7 @@ public class FeedbackServiceImpl extends AbstractCRUDServiceImpl<FeedbackDao, Fe
UserEntity
userEntity
=
userMap
.
get
(
item
.
getCreateUserId
());
if
(
userEntity
!=
null
)
{
item
.
setPhotoPath
(
userEntity
.
getPhotoPath
());
item
.
setFeedbackName
(
userEntity
.
getRealName
());
}
}
}
...
...
enterprise-manager/src/main/java/com/mortals/xhx/module/feedback/web/FeedbackController.java
View file @
12e03368
...
...
@@ -51,7 +51,7 @@ public class FeedbackController extends BaseCRUDJsonBodyMappingController<Feedba
this
.
addDict
(
model
,
"feedbackType"
,
paramService
.
getParamBySecondOrganize
(
"Feedback"
,
"feedbackType"
));
this
.
addDict
(
model
,
"processStatus"
,
paramService
.
getParamBySecondOrganize
(
"Feedback"
,
"processStatus"
));
this
.
addDict
(
model
,
"deptId"
,
deptService
.
find
(
new
DeptQuery
()).
stream
().
collect
(
Collectors
.
toMap
(
x
->
x
.
getId
().
toString
(),
y
->
y
.
getDeptName
(),
(
o
,
n
)
->
n
)
));
this
.
addDict
(
model
,
"deptId"
,
paramService
.
getParamBySecondOrganize
(
"Feedback"
,
"deptId"
));
super
.
init
(
model
,
context
);
...
...
enterprise-manager/src/main/java/com/mortals/xhx/module/news/web/NewsController.java
View file @
12e03368
...
...
@@ -73,8 +73,7 @@ public class NewsController extends BaseCRUDJsonBodyMappingController<NewsServic
this
.
addDict
(
model
,
"top"
,
paramService
.
getParamBySecondOrganize
(
"News"
,
"top"
));
this
.
addDict
(
model
,
"viewNums"
,
paramService
.
getParamBySecondOrganize
(
"News"
,
"viewNums"
));
this
.
addDict
(
model
,
"categoryId"
,
newsCategoryService
.
find
(
new
NewsCategoryQuery
()).
stream
().
collect
(
Collectors
.
toMap
(
x
->
x
.
getId
().
toString
(),
y
->
y
.
getName
(),
(
o
,
n
)
->
n
)));
this
.
addDict
(
model
,
"deptId"
,
deptService
.
find
(
new
DeptQuery
()).
stream
().
collect
(
Collectors
.
toMap
(
x
->
x
.
getId
().
toString
(),
y
->
y
.
getDeptName
(),
(
o
,
n
)
->
n
)));
this
.
addDict
(
model
,
"deptId"
,
paramService
.
getParamBySecondOrganize
(
"News"
,
"deptId"
));
this
.
addDict
(
model
,
"createUserId"
,
userService
.
find
(
new
UserQuery
()).
stream
().
collect
(
Collectors
.
toMap
(
x
->
x
.
getId
().
toString
(),
y
->
y
.
getRealName
(),
(
o
,
n
)
->
n
)));
super
.
init
(
model
,
context
);
...
...
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