|
@@ -998,7 +998,7 @@ public class PayOrderLogic {
|
|
|
|
|
|
return settlementOrderService.lambdaQuery()
|
|
return settlementOrderService.lambdaQuery()
|
|
.in(!CollectionUtils.isEmpty(status),SettlementOrder::getStatus,status)
|
|
.in(!CollectionUtils.isEmpty(status),SettlementOrder::getStatus,status)
|
|
- .eq(SettlementOrder::getWorkerId,currentCompanyWechat.getUserId())
|
|
|
|
|
|
+ .eq(SettlementOrder::getWorkerId,currentCompanyWechat.getUser().getWorkerNumber())
|
|
.between(!StringUtil.isEmpty(startTime),SettlementOrder::getCreateTime,startTime,endTime)
|
|
.between(!StringUtil.isEmpty(startTime),SettlementOrder::getCreateTime,startTime,endTime)
|
|
.in(SettlementOrder::getCompanyWechatId,currentCompanyWechat.getCompanyWechatId())
|
|
.in(SettlementOrder::getCompanyWechatId,currentCompanyWechat.getCompanyWechatId())
|
|
.orderByDesc(SettlementOrder::getCreateTime)
|
|
.orderByDesc(SettlementOrder::getCreateTime)
|