|
@@ -62,6 +62,9 @@ public class SkuDefaultPackageSpecServiceImpl extends ServiceImpl<SkuDefaultPack
|
|
|
Page<SkuDefaultPackageSpecVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
|
|
|
|
|
|
List<SkuDefaultPackageSpecVo> records = page.getRecords();
|
|
|
+ if (records.isEmpty()) {
|
|
|
+ return page;
|
|
|
+ }
|
|
|
|
|
|
List<Long> tempBomSpecIdList = new ArrayList<>();
|
|
|
for (SkuDefaultPackageSpecVo record : records) {
|
|
@@ -80,6 +83,9 @@ public class SkuDefaultPackageSpecServiceImpl extends ServiceImpl<SkuDefaultPack
|
|
|
}
|
|
|
|
|
|
List<Long> bomSpecIdList = tempBomSpecIdList.stream().distinct().filter(Objects::nonNull).collect(Collectors.toList());
|
|
|
+ if (bomSpecIdList.isEmpty()) {
|
|
|
+ return page;
|
|
|
+ }
|
|
|
|
|
|
Map<Long, String> map = bomSpecService.mapKV(BaseIdPo::getId, BomSpec::getCode, q -> q.in(BaseIdPo::getId, bomSpecIdList));
|
|
|
|
|
@@ -146,6 +152,10 @@ public class SkuDefaultPackageSpecServiceImpl extends ServiceImpl<SkuDefaultPack
|
|
|
tempBomSpecIdList.add(result.getAccessoryId());
|
|
|
|
|
|
List<Long> bomSpecIdList = tempBomSpecIdList.stream().distinct().filter(Objects::nonNull).collect(Collectors.toList());
|
|
|
+
|
|
|
+ if (bomSpecIdList.isEmpty()) {
|
|
|
+ return result;
|
|
|
+ }
|
|
|
Map<Long, String> map = bomSpecService.mapKV(BaseIdPo::getId, BomSpec::getCode, q -> q.in(BaseIdPo::getId, bomSpecIdList));
|
|
|
if (result.getColouredPaperId() != null) {
|
|
|
result.setColouredPaperCode(map.get(result.getColouredPaperId()));
|