需求

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

@@ -195,6 +195,8 @@ public class OrderBaseLogic {
         if(!StringUtils.equals(currentCompanyWechat.getUser().getType(),UserTypeEnum.WORKER.getKey())){
             return new Page<>(pageNum,pageSize);
         }
+
+        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()
                     .eq(PgOrderWorker::getWorkerId,currentCompanyWechat.getUserId()))
@@ -282,6 +284,7 @@ public class OrderBaseLogic {
                 )
                 .ne(isYb != null && isYb,PgOrderBase::getPgIncreOrderId,"")
                 .ne(isWb != null && isWb,PgOrderBase::getRpProjectRepairId,"")
+                .in(CollectionUtils.isNotEmpty(websitIds),PgOrderBase::getWebsitId,websitIds)
                 .eq(StringUtils.isNotBlank(pgIncreOrderId),PgOrderBase::getPgIncreOrderId,pgIncreOrderId)
                 .and(v -> v.eq(PgOrderBase::getOrderStatus,OrderBaseStatusEnum.DQD.getKey())
                         .or().in(CollectionUtils.isNotEmpty(orderBaseIds),PgOrderBase::getId,orderBaseIds))