From 43cdfdf2de6df7f8bb37b5d6eaf6b7811dc53907 Mon Sep 17 00:00:00 2001
From: zhenghaoyu <zhenghaoyu@superbgrace.com>
Date: Sat, 11 Nov 2023 10:43:56 +0800
Subject: [PATCH] =?UTF-8?q?1.=E8=A3=85=E8=BD=A6=E6=89=AB=E6=8F=8F=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../distribution/mapper/DistributionDeliveryListMapper.xml      | 2 +-
 .../service/impl/DistributionDeliveryListServiceImpl.java       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.xml
index a160712dd..e9071803c 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.xml
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.xml
@@ -725,7 +725,7 @@
         <where>
             lddl.is_deleted =0
             <if test=" param.type != null and param.type != ''">and  lddl.type = #{param.type}</if>
-            <if test=" array != null ">
+            <if test="array != null and @org.apache.commons.collections4.CollectionUtils@isNotEmpty(array)">
                 and lddl.id in
                 <foreach collection="array" item="item" open="(" close=")" separator=",">
                     #{item}
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java
index ea3a6bd74..d9505be3a 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java
@@ -2327,7 +2327,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 		//判断当前登录人是否为司机
 		List<DistributionAppDeliveryListVO> distributionAppDeliveryListVOS = new ArrayList<>();
 		boolean delivery = false;
-		String value1 = DictBizCache.getValue("role_class", "delivery_driver");
+			String value1 = DictBizCache.getValue("role_class", "delivery_driver_new");
 		if (roleId.contains(value1)) delivery = true;