Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
C
cloud-platform
Project
Project
Details
Activity
Releases
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
youjj
cloud-platform
Commits
5469bc66
Commit
5469bc66
authored
Sep 19, 2019
by
libin
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/dev' into dev
parents
d6e598d9
dcf2761e
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
2 deletions
+3
-2
BackStageOrderController.java
...om/xxfc/platform/order/rest/BackStageOrderController.java
+3
-2
No files found.
xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/rest/BackStageOrderController.java
View file @
5469bc66
...
...
@@ -223,11 +223,12 @@ public class BackStageOrderController extends CommonBaseController implements Us
List
<
Integer
>
list
=
userFeign
.
getUserIdByUsername
(
dto
.
getKeywords
());
if
(
list
!=
null
)
{
userIds
.
addAll
(
list
);
}
else
{
}
if
(
userIds
.
size
()
<=
0
)
{
return
ObjectRestResponse
.
succ
(
new
PageDataVO
<>());
}
}
dto
.
setUserIds
(
userIds
);
UserDTO
userDTO
=
getAdminUserInfo
();
if
(
userDTO
==
null
)
{
return
ObjectRestResponse
.
succ
(
new
PageDataVO
<>());
...
...
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