|
@@ -890,7 +890,9 @@ public class PayOrderLogic {
|
|
|
)
|
|
|
.eq(!StringUtil.isEmpty(payStatus) && payStatus.equals(MaterialExamineStatusEnum.PAID.getKey()),WorkerOrder::getRefundStatus, IsYesNoEnum.NO.getKey())
|
|
|
|
|
|
- .eq(WorkerOrder::getUserId,currentCompanyWechat.getUser().getUserId())
|
|
|
+ .and(item -> item.eq(WorkerOrder::getUserId,currentCompanyWechat.getUser().getUserId())
|
|
|
+ .or().eq(WorkerOrder::getWorkerNumber,currentCompanyWechat.getUser().getWorkerNumber())
|
|
|
+ )
|
|
|
.between(!StringUtil.isEmpty(startTime),WorkerOrder::getCreateTime,startTime,endTime)
|
|
|
.in(WorkerOrder::getCompanyWechatId,currentCompanyWechat.getCompanyWechatId())
|
|
|
.orderByDesc(WorkerOrder::getCreateTime)
|