修改筛选项

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

@@ -69,6 +69,14 @@ public class OrderServiceListServiceImpl implements OrderServiceListService {
 			}
 		}
 
+		if (ListUtils.isNotEmpty(reqDTO.getEngineerCodes())){
+			lqw.and(w ->
+					w.in(OrderInfo::getEngineerCode, reqDTO.getEngineerCodes())
+							.or()
+							.in(OrderInfo::getEngineerCodeSub, reqDTO.getEngineerCodes())
+			);
+		}
+
 		if (ListUtils.isNotEmpty(reqDTO.getTypeCategory())) {
 			String types = "'" + String.join("','", reqDTO.getTypeCategory()) + "'";
 			String sql = String.format("select 1 from skill_info sk where sk.brand = order_info.brand and sk.type = order_info.type and sk.skill = order_info.skill and type_category in (%s)", types);
@@ -81,11 +89,6 @@ public class OrderServiceListServiceImpl implements OrderServiceListService {
 			lqw.exists(sql);
 		}
 
-		if (ListUtils.isNotEmpty(reqDTO.getEngineerCodes())) {
-			String engineerCodes = "'" + String.join("','", reqDTO.getEngineerCodes()) + "'";
-			String sql = String.format("select 1 from order_appointment oa where oa.order_id = order_info.order_id and oa.dt = order_info.dt and oa.engineer_code in (%s)", engineerCodes);
-			lqw.exists(sql);
-		}
 
 		if (ListUtils.isNotEmpty(reqDTO.getGroupCategory())) {
 			String groupCategory = reqDTO.getGroupCategory().stream().map(Object::toString).collect(Collectors.joining(","));