Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
J
jiedao-api-boot-master
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
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
lanbaoming
jiedao-api-boot-master
Commits
61b11b55
Commit
61b11b55
authored
Sep 11, 2024
by
huyf
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
误提交。注释代码
parent
8eba1aa4
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
6 deletions
+6
-6
BoxServiceImpl.java
...der/yudao/module/shipment/service/box/BoxServiceImpl.java
+6
-6
No files found.
yudao-module-shipment/yudao-module-shipment-core/src/main/java/cn/iocoder/yudao/module/shipment/service/box/BoxServiceImpl.java
View file @
61b11b55
...
...
@@ -1575,12 +1575,12 @@ public class BoxServiceImpl extends AbstractService<BoxMapper, BoxDO> implements
warehouseIdList
=
warehouseList
.
stream
().
map
(
WarehouseDO:
:
getId
).
collect
(
Collectors
.
toList
());
query
.
setWarehouseIdList
(
warehouseIdList
);
}
if
(
CollectionUtil
.
isNotEmpty
(
query
.
getCountryIdList
()))
{
List
<
WarehouseDO
>
warehouseList
=
warehouseService
.
findByCountryIdList
(
query
.
getCountryIdList
());
warehouseIdList
=
warehouseList
.
stream
().
map
(
WarehouseDO:
:
getId
).
collect
(
Collectors
.
toList
());
query
.
setWarehouseIdList
(
warehouseIdList
);
}
//
if (CollectionUtil.isNotEmpty(query.getCountryIdList())) {
//
List<WarehouseDO> warehouseList =
//
warehouseService.findByCountryIdList(query.getCountryIdList());
//
warehouseIdList = warehouseList.stream().map(WarehouseDO::getId).collect(Collectors.toList());
//
query.setWarehouseIdList(warehouseIdList);
//
}
//上面都是处理查询条件相关逻辑
return
boxInfoQuery1
(
boxMapper
.
selectPage2
(
page
,
query
),
false
);
}
...
...
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