修改

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

@@ -38,7 +38,6 @@ public class OrderAssignCheck {
 	@Autowired
 	@Autowired
 	EngineerBusinessMPDao engineerBusinessMPDao;
 	EngineerBusinessMPDao engineerBusinessMPDao;
 
 
-
 	@Data
 	@Data
 	public class Result {
 	public class Result {
 		private Boolean canAssign;
 		private Boolean canAssign;
@@ -61,9 +60,7 @@ public class OrderAssignCheck {
 	public Result orderAssignCheck(String orderId, String engineerCode) {
 	public Result orderAssignCheck(String orderId, String engineerCode) {
 		log.info("begin orderAssignCheck:orderId={}, engineerCode={}", orderId, engineerCode);
 		log.info("begin orderAssignCheck:orderId={}, engineerCode={}", orderId, engineerCode);
 
 
-		log.info(">>>>>>>>:orderRequestMpDao:{}, is null :{}", orderRequestMPDao, orderRequestMPDao == null);
 		OrderRequest order = orderRequestMPDao.getByOrderId(orderId);
 		OrderRequest order = orderRequestMPDao.getByOrderId(orderId);
-		log.info(">>>>>>>:order:{}, order is null:{}", order, order == null);
 		double curX = Double.parseDouble(order.getX());
 		double curX = Double.parseDouble(order.getX());
 		double curY = Double.parseDouble(order.getY());
 		double curY = Double.parseDouble(order.getY());
 
 
@@ -122,6 +119,10 @@ public class OrderAssignCheck {
 			}
 			}
 			orderIds.add(o.getOrderId());
 			orderIds.add(o.getOrderId());
 		}
 		}
+		if(orderIds.isEmpty()){
+			return orderSegments;
+		}
+
 		Map<String, List<OrderAppointment>> m = appointments.stream().collect(Collectors.groupingBy(OrderAppointment::getOrderId));
 		Map<String, List<OrderAppointment>> m = appointments.stream().collect(Collectors.groupingBy(OrderAppointment::getOrderId));
 		List<OrderRequest> orderRequests = orderRequestMPDao.selectByOrderIds(orderIds);
 		List<OrderRequest> orderRequests = orderRequestMPDao.selectByOrderIds(orderIds);
 		for(OrderRequest o: orderRequests) {
 		for(OrderRequest o: orderRequests) {