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

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

@@ -724,7 +724,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}

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;