|
|
@@ -155,7 +155,7 @@ public class WithdrawalLogic {
|
|
|
CurrentCompanyWechat currentCompanyWechat = commonLogic.getCurrentCompanyWechat();
|
|
|
Page<WithdrawalOrder> page = withdrawalOrderService.lambdaQuery()
|
|
|
.between(StringUtils.isNotBlank(startTime) && StringUtils.isNotBlank(endTime),WithdrawalOrder::getCreateTime,startTime,endTime)
|
|
|
- .eq(WithdrawalOrder::getWorkerId,currentCompanyWechat.getUserId())
|
|
|
+ .eq(WithdrawalOrder::getWorkerId,currentCompanyWechat.getUser().getWorkerNumber())
|
|
|
.orderByDesc(WithdrawalOrder::getCreateTime).page(new Page<>(pageNum, pageSize));
|
|
|
return page;
|
|
|
}
|
|
|
@@ -183,7 +183,7 @@ public class WithdrawalLogic {
|
|
|
|
|
|
public SettlementAmountBean totalAmount(){
|
|
|
CurrentCompanyWechat currentCompanyWechat = commonLogic.getCurrentCompanyWechat();
|
|
|
- return this.totalAmount(currentCompanyWechat.getUserId(),null,null);
|
|
|
+ return this.totalAmount(currentCompanyWechat.getUser().getWorkerNumber(),null,null);
|
|
|
}
|
|
|
|
|
|
/**
|
