需求

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

@@ -197,7 +197,8 @@ public class OrderBaseLogic {
             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> 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()))
@@ -288,7 +289,7 @@ public class OrderBaseLogic {
                 .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))
+                        .or(CollectionUtils.isNotEmpty(orderBaseIds)).in(CollectionUtils.isNotEmpty(orderBaseIds),PgOrderBase::getId,orderBaseIds))
                 .and(StringUtils.isNotBlank(keyword),
                         v -> v.like(PgOrderBase::getId,keyword).or()
                                 .like(PgOrderBase::getUserName,keyword).or()