需求

mall-server-api/src/main/java/com/gree/mall/manager/logic/workorder/OrderBaseLogic.java

@@ -2375,9 +2375,11 @@ public class OrderBaseLogic {
 
                 .in(!StringUtil.isEmpty(jsmWorkerOrder.getStatus()) && jsmWorkerOrder.getStatus().equals("YWC"),PgOrderBase::getOrderStatus,"YWG","GCSZX","WDWG","YWGO","YJS","LRCD")
 
-                .and(item -> item.in(!CollectionUtil.isEmpty(jsmWorkerOrder.getWorkerOrderIds()),PgOrderBase::getId, jsmWorkerOrder.getWorkerOrderIds()).or(!StringUtil.isEmpty(jsmWorkerOrder.getMobile()))
-                .eq(!StringUtil.isEmpty(jsmWorkerOrder.getMobile()),PgOrderBase::getUserMobile,jsmWorkerOrder.getMobile())
+                .and(!CollectionUtil.isEmpty(jsmWorkerOrder.getWorkerOrderIds()) && !CollectionUtil.isEmpty(jsmWorkerOrder.getWorkerOrderIds()),item -> item.in(PgOrderBase::getId, jsmWorkerOrder.getWorkerOrderIds())
+                                .or()
+                .eq(PgOrderBase::getUserMobile,jsmWorkerOrder.getMobile())
                 )
+                .eq(CollectionUtil.isEmpty(jsmWorkerOrder.getWorkerOrderIds()) && !CollectionUtil.isEmpty(jsmWorkerOrder.getWorkerOrderIds()),PgOrderBase::getUserMobile,jsmWorkerOrder.getMobile())
                 .orderByDesc(PgOrderBase::getCreateTime)
                 .page(new Page<>(jsmWorkerOrder.getPageNo(), jsmWorkerOrder.getPageSize()));