Merge branch 'dev_dispatch_filter0711' into 'develop'

修改“”

See merge request !210

project-order/src/main/java/com/dituhui/pea/order/service/impl/DispatchServiceImpl.java

@@ -295,7 +295,7 @@ public class DispatchServiceImpl implements DispatchService {
 				lqw.ge(OrderRequest::getPriority, 1);
 				lqw.ge(OrderRequest::getPriority, 1);
 			} else if (p.contains(0) && !p.contains(1)) {
 			} else if (p.contains(0) && !p.contains(1)) {
 				lqw.le(OrderRequest::getPriority, 1);
 				lqw.le(OrderRequest::getPriority, 1);
-			} else if (p.contains(1) && p.contains(0)) {
+			} else if (p.contains(1) && !p.contains(0)) {
 				lqw.ge(OrderRequest::getPriority, 5);
 				lqw.ge(OrderRequest::getPriority, 5);
 			}
 			}
 		}
 		}

project-order/src/main/java/com/dituhui/pea/order/service/impl/OrderServiceListServiceImpl.java

@@ -65,7 +65,7 @@ public class OrderServiceListServiceImpl implements OrderServiceListService {
 				lqw.ge(OrderRequest::getPriority, 1);
 				lqw.ge(OrderRequest::getPriority, 1);
 			} else if (p.contains(0) && !p.contains(1)) {
 			} else if (p.contains(0) && !p.contains(1)) {
 				lqw.le(OrderRequest::getPriority, 1);
 				lqw.le(OrderRequest::getPriority, 1);
-			} else if (p.contains(1) && p.contains(0)) {
+			} else if (p.contains(1) && !p.contains(0)) {
 				lqw.ge(OrderRequest::getPriority, 5);
 				lqw.ge(OrderRequest::getPriority, 5);
 			}
 			}
 		}
 		}