From 9018197b829083e5cdbe6bf3eb06d1dbeb696e8d Mon Sep 17 00:00:00 2001 From: jiangchao Date: Thu, 16 Mar 2023 09:44:59 +0800 Subject: [PATCH] feature(bug): 搜索调岗之前的门店，获取薪酬额外数据 --- fw-morax-service/src/main/java/cn/fw/morax/service/biz/calculator/salary/DynamicSalaryCalculator.java | 1 + 1 file changed, 1 insertion(+), 0 deletions(-) diff --git a/fw-morax-service/src/main/java/cn/fw/morax/service/biz/calculator/salary/DynamicSalaryCalculator.java b/fw-morax-service/src/main/java/cn/fw/morax/service/biz/calculator/salary/DynamicSalaryCalculator.java index 50ed19e..48e2e4e 100644 --- a/fw-morax-service/src/main/java/cn/fw/morax/service/biz/calculator/salary/DynamicSalaryCalculator.java +++ b/fw-morax-service/src/main/java/cn/fw/morax/service/biz/calculator/salary/DynamicSalaryCalculator.java @@ -96,6 +96,7 @@ public class DynamicSalaryCalculator extends SalaryBaseCalculator { .eq(SalaryGroupUser::getUserId, pool.getUserId()) .ge(SalaryGroupUser::getDataDate, startTime) .le(SalaryGroupUser::getDataDate, date) + .eq(SalaryGroupUser::getYn, Boolean.TRUE) ); List shopIds = groupUsers.stream().map(SalaryGroupUser::getShopId).distinct().collect(Collectors.toList()); -- libgit2 0.22.2