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
03118e40
Commit
03118e40
authored
Nov 15, 2019
by
jiaorz
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
后台订单接口优化
parent
984f9d3a
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
0 additions
and
10 deletions
+0
-10
BackgroundBaseOrderBiz.java
...a/com/xxfc/platform/order/biz/BackgroundBaseOrderBiz.java
+0
-10
No files found.
xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/BackgroundBaseOrderBiz.java
View file @
03118e40
...
...
@@ -17,7 +17,6 @@ import lombok.extern.slf4j.Slf4j;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Service
;
import
java.util.ArrayList
;
import
java.util.Date
;
import
java.util.List
;
import
java.util.stream.Collectors
;
...
...
@@ -47,15 +46,6 @@ public class BackgroundBaseOrderBiz extends BaseBiz<BaseOrderMapper, BaseOrder>
List
<
BranchCompany
>
branchCompanies
=
vehicleFeign
.
companyAll
(
userDTO
.
getDataAll
(),
userDTO
.
getDataCompany
(),
userDTO
.
getDataZone
());
List
<
Integer
>
companyIds
=
branchCompanies
.
stream
().
map
(
BranchCompany:
:
getId
).
collect
(
Collectors
.
toList
());
//大区搜索
if
(
dto
.
getZoneId
()
!=
null
)
{
if
(
userDTO
.
getDataAll
()
!=
1
&&
!
dto
.
getZoneId
().
equals
(
userDTO
.
getZoneId
()))
{
return
ObjectRestResponse
.
succ
(
new
PageDataVO
<>());
}
else
{
ArrayList
<
Integer
>
zoneIds
=
new
ArrayList
<>();
zoneIds
.
add
(
dto
.
getZoneId
());
dto
.
setZoneIds
(
zoneIds
);
}
}
//所属公司筛选
if
(
dto
.
getStartCompanyId
()
!=
null
)
{
if
(
companyIds
.
size
()
>
0
)
{
...
...
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