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