Merge branch 'dev' into pre-production

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.xml

@@ -757,7 +757,7 @@
         logpm_distribution_delivery_list lddl
         left join logpm_distribution_delivery_self ldds on lddl.id =ldds.delivery_id
         <where>
-            lddl.is_deleted =0 and lddl.warehouse_id =#{warehouseId}
+            lddl.is_deleted =0 and lddl.customers_number > 0 and lddl.warehouse_id =#{warehouseId}
             <if test=" param.type != null and param.type != ''">and  lddl.type = #{param.type}</if>
             <if test="array != null and @org.apache.commons.collections4.CollectionUtils@isNotEmpty(array)">
                 and lddl.id in

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

@@ -25,6 +25,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.logpm.aftersales.vo.AftersalesAbnormalPackageVO;
 import com.logpm.basic.entity.BasicPrintTemplateEntity;
 import com.logpm.basic.feign.IBasicPrintTemplateClient;
@@ -2196,19 +2197,17 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 
 	@Override
 	public IPage<DistributionAppDeliveryListVO> selectDistributionAppDeliveryListPage(IPage<DistributionAppDeliveryListVO> page, DistributionAppDeliveryListDTO distributionAppDeliveryListDTO) {
+		List<DistributionAppDeliveryListVO> distributionAppDeliveryListVOS = new ArrayList<>();
 
+		try {
 //获取当前登录人
 			BladeUser user = AuthUtil.getUser();
 			String roleId = user.getRoleId();
 			//判断当前登录人是否为司机
-		List<DistributionAppDeliveryListVO> distributionAppDeliveryListVOS = new ArrayList<>();
 			boolean delivery = false;
 			String value1 = DictBizCache.getValue("role_class", "delivery_driver_new");
 			if (roleId.contains(value1)) delivery = true;
-
 			BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse();
-
-
 //		R<String> value = dictBizClient.getValue("role_class", roleId);
 			if (delivery) {
 				//查询当前登录人的配送任务
@@ -2268,7 +2267,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 					int invertoryNum = reservationEntityList.stream().mapToInt(DistributionReservationEntity::getReservationStockListNum).sum();
 					distributionAppDeliveryListVO.setDeliveryNumber(packageNum + invertoryNum);
 				} else {
-				return null;
+					continue;
 				}
 				distributionAppDeliveryListVO.setSignNub(lad + nad);
 				//查询完成客户数
@@ -2344,7 +2343,11 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 					distributionAppDeliveryListVO.setDriverName(stringBuilder.toString());
 				}
 			}
+		} catch (Exception e) {
+			log.error(">>>>>>>> 司机配送装车查询 报错", e);
+		}
 		return page.setRecords(distributionAppDeliveryListVOS);
+
 	}
 
 	@Override