|
@@ -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){
|