需求

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/logic/workorder/OrderBaseLogic.java

@@ -199,8 +199,10 @@ public class OrderBaseLogic {
 
         List<String> websitIds = websitUserService.lambdaQuery().eq(WebsitUser::getUserId, currentCompanyWechat.getUserId()).select(WebsitUser::getWebsitId).list().stream().map(WebsitUser::getWebsitId).collect(Collectors.toList());
         List<String> orderBaseIds = pgOrderWorkerService.lambdaQuery()
-                    .and(item -> item.eq(PgOrderWorker::getWorkerNumber, currentCompanyWechat.getUser().getWorkerNumber()).or()
+                    .and(!StringUtil.isEmpty(currentCompanyWechat.getUser().getWorkerNumber()),
+                            item -> item.eq(PgOrderWorker::getWorkerNumber, currentCompanyWechat.getUser().getWorkerNumber()).or()
                     .eq(PgOrderWorker::getWorkerId,currentCompanyWechat.getUserId()))
+                    .eq(StringUtil.isEmpty(currentCompanyWechat.getUser().getWorkerNumber()),PgOrderWorker::getWorkerId,currentCompanyWechat.getUserId())
                     .list().stream().map(PgOrderWorker::getOrderBaseId).distinct().collect(Collectors.toList());
 
         if(byDay != null){