Commit 637b4d91 authored by 332784038@qq.com's avatar 332784038@qq.com

Merge branch 'master-zhengyi' into dev

parents 8442ecfc da3a871c
...@@ -254,7 +254,7 @@ public class OrderTimeServiceImpl extends AbstractService<OrderTimeMapper, Order ...@@ -254,7 +254,7 @@ public class OrderTimeServiceImpl extends AbstractService<OrderTimeMapper, Order
backList.add(enList.get(0)); backList.add(enList.get(0));
} }
} }
backList = backList.stream().filter(t -> t.getStatus() != 15).sorted(Comparator.comparing(OrderTimeDO::getId)).collect(Collectors.toList()); backList = backList.stream().filter(t -> t.getStatus() != 15 && t.getStatus() != 150330).sorted(Comparator.comparing(OrderTimeDO::getId)).collect(Collectors.toList());
return OrderTimeConvert.INSTANCE.convertList(backList); return OrderTimeConvert.INSTANCE.convertList(backList);
} }
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment