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

project-order/src/main/java/com/dituhui/pea/order/common/OrderAssignCheck.java

@@ -105,12 +105,12 @@ public class OrderAssignCheck {
 			OrderSegment pre = orderSegments.get(index);
 			OrderSegment pre = orderSegments.get(index);
 			// 为当前订单
 			// 为当前订单
 			OrderSegment post = new OrderSegment(start, end, Double.parseDouble(order.getX()), Double.parseDouble(order.getY()));
 			OrderSegment post = new OrderSegment(start, end, Double.parseDouble(order.getX()), Double.parseDouble(order.getY()));
+			return this.getResult(curX, curY, pre, post, takeTime, order.getDt());
 		} else {
 		} else {
 			OrderSegment pre = orderSegments.get(index);
 			OrderSegment pre = orderSegments.get(index);
 			OrderSegment post = orderSegments.get(index+1);
 			OrderSegment post = orderSegments.get(index+1);
 			return this.getResult(curX, curY, pre, post, takeTime, order.getDt());
 			return this.getResult(curX, curY, pre, post, takeTime, order.getDt());
 		}
 		}
-		return null;
 	}
 	}
 
 
 	private List<OrderSegment> getEngineerOrderSegments(String engineerCode, LocalDate dt) {
 	private List<OrderSegment> getEngineerOrderSegments(String engineerCode, LocalDate dt) {