修改

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

@@ -70,7 +70,7 @@ public class OrderAssignImpl implements OrderAssign {
 
 
 		String date = TimeUtils.timestamp2DateTime(order.getExpectTimeBegin(), TimeUtils.DATE_GAP_FORMAT);
 		String date = TimeUtils.timestamp2DateTime(order.getExpectTimeBegin(), TimeUtils.DATE_GAP_FORMAT);
 
 
-		// 获取group内的小组成员
+		// 获取符合筛选条件的技术员
 		List<String> engineerCodes = this.searchEngineerCodes(order, distance, key, recommend);
 		List<String> engineerCodes = this.searchEngineerCodes(order, distance, key, recommend);
 		List<EngineerInfo> engineers = engineerInfoMPDao.selectByEngineerCodes(engineerCodes);
 		List<EngineerInfo> engineers = engineerInfoMPDao.selectByEngineerCodes(engineerCodes);
 
 
@@ -306,13 +306,14 @@ public class OrderAssignImpl implements OrderAssign {
 			return new ArrayList<>();
 			return new ArrayList<>();
 		}
 		}
 
 
+		/*
 		if (StringUtils.isEmpty(distance)) {
 		if (StringUtils.isEmpty(distance)) {
 			return new ArrayList<>(engineerCodes1);
 			return new ArrayList<>(engineerCodes1);
 		}
 		}
-
 		//进行距离匹配TODO
 		//进行距离匹配TODO
+		*/
 
 
-		return null;
+		return new ArrayList<>(engineerCodes1);
 	}
 	}
 
 
 	private Set<String> searchEngineerByRecommend(OrderRequest order, String recommend) {
 	private Set<String> searchEngineerByRecommend(OrderRequest order, String recommend) {