|
@@ -265,8 +265,8 @@ public class QrBoxMappingServiceImpl implements QrBoxMappingService {
|
|
|
@Override
|
|
|
public List<QrBoxExportProperty> downloadExcelData(ListQrBoxCodeMappingExportReq req) {
|
|
|
List<QrBoxMappingVO> qrBoxMappingVOList = qrBoxMappingMapper.listQrBoxCodeMapping(req);
|
|
|
+ List<QrBoxExportProperty> qrBoxExportProperties = new ArrayList<>();
|
|
|
if(CollectionUtils.isNotEmpty(qrBoxMappingVOList)){
|
|
|
- List<QrBoxExportProperty> qrBoxExportProperties = new ArrayList<>();
|
|
|
for (QrBoxMappingVO qrBoxMappingVO:qrBoxMappingVOList) {
|
|
|
QrBoxExportProperty qrBoxExportProperty = PojoConverterUtils.copy(qrBoxMappingVO, QrBoxExportProperty.class);
|
|
|
if(InvalidEnum.INVALID.is(qrBoxMappingVO.getInvalid())){
|
|
@@ -280,9 +280,8 @@ public class QrBoxMappingServiceImpl implements QrBoxMappingService {
|
|
|
}
|
|
|
qrBoxExportProperties.add(qrBoxExportProperty);
|
|
|
}
|
|
|
- return qrBoxExportProperties;
|
|
|
}
|
|
|
- return null;
|
|
|
+ return qrBoxExportProperties;
|
|
|
}
|
|
|
|
|
|
/**
|