Merge remote-tracking branch 'origin/dev' into dev

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java

@@ -487,11 +487,13 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 //			return null;
 //		}
 		List<Long> orderIds = reservationStockarticleEntityList.stream().map(DistributionReservationStockarticleEntity::getStockArticleId).collect(Collectors.toList());
-		List<DistributionStockArticleEntity> stockArticleEntities = distributionStockArticleService.listByIds(orderIds);
-		List<DistributionSignPrintVO> printEntities = baseMapper.selectSignImgsUrl(distributionSignforVO.getReservationId());
-		distributionSignforVO.setPrintVOList(printEntities);
-		if (Func.isNotEmpty(stockArticleEntities)) {
-			distributionSignforVO.setOrderInfo(DistributionStockArticleWrapper.build().listVO(stockArticleEntities));
+		if (Func.isNotEmpty(orderIds)){
+			List<DistributionStockArticleEntity> stockArticleEntities = distributionStockArticleService.listByIds(orderIds);
+			List<DistributionSignPrintVO> printEntities = baseMapper.selectSignImgsUrl(distributionSignforVO.getReservationId());
+			distributionSignforVO.setPrintVOList(printEntities);
+			if (Func.isNotEmpty(stockArticleEntities)) {
+				distributionSignforVO.setOrderInfo(DistributionStockArticleWrapper.build().listVO(stockArticleEntities));
+			}
 		}
 //		List<DistributionStockArticleVO> stockArticleEntityList = baseMapper.selectOrderList(id);
 		return distributionSignforVO;