|
|
@@ -268,10 +268,7 @@ public class WorkOrderServiceImpl extends ServiceImpl<WorkOrderMapper, WorkOrder
|
|
|
|
|
|
//根据订单号或者车牌号可以模糊查询,前端传orderNO即可
|
|
|
if (StringUtils.isNotBlank(workOrderParam.getOrderNo())) {
|
|
|
- queryWrapper.like("car_number", workOrderParam.getCarNumber());
|
|
|
- }
|
|
|
- if (StringUtils.isNotBlank(workOrderParam.getOrderNo())) {
|
|
|
- queryWrapper.like("order_no", workOrderParam.getOrderNo());
|
|
|
+ queryWrapper.and(wrapper -> wrapper.like("car_number", workOrderParam.getCarNumber()).or().like("order_no", workOrderParam.getOrderNo()));
|
|
|
}
|
|
|
if (workOrderParam.getOrgId() != null) {
|
|
|
queryWrapper.eq("org_id", workOrderParam.getOrgId());
|