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

blade-service/logpm-data-sharing/src/main/java/com/logpm/datasharing/service/impl/LogpmDataSearchServiceImpl.java

@@ -412,6 +412,10 @@ public class LogpmDataSearchServiceImpl implements ILogpmDataSearchService {
 		nodeInfoVO.setOperateName("入库");
 		nodeInfoVO.setOperateWarehouseName(departureWarehouseName);
 		List<DistributionParcelListEntity> distributionParcelListEntities = groupedByWarehouse.get(departureWarehouseName);
+		if(distributionParcelListEntities==null || distributionParcelListEntities.isEmpty()){
+			return null;
+		}
+
 		// 获取第一个时间
 		nodeInfoVO.setOperateTime(distributionParcelListEntities.get(0).getCreateTime());
 		nodeInfoVO.setOperateNumber(distributionParcelListEntities.size() + "/" + totalCount);