‘linchangsheng’ 10 달 전
부모
커밋
b56bc81222
1개의 변경된 파일2개의 추가작업 그리고 1개의 파일을 삭제
  1. 2 1
      mall-miniapp-service/src/main/java/com/gree/mall/miniapp/logic/workorder/OrderBaseLogic.java

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

@@ -176,7 +176,8 @@ public class OrderBaseLogic {
             return new Page<>(pageNum,pageSize);
         }
         List<String> orderBaseIds = pgOrderWorkerService.lambdaQuery()
-                    .eq(PgOrderWorker::getWorkerId, currentCompanyWechat.getUser().getWorkerNumber())
+                    .and(item -> item.eq(PgOrderWorker::getWorkerNumber, currentCompanyWechat.getUser().getWorkerNumber()).or()
+                    .eq(PgOrderWorker::getWorkerId,currentCompanyWechat.getUserId()))
                     .list().stream().map(PgOrderWorker::getOrderBaseId).distinct().collect(Collectors.toList());
 
         if(byDay != null){