diff --git a/src/com/engine/salary/biz/SpecialAddDeductionBiz.java b/src/com/engine/salary/biz/SpecialAddDeductionBiz.java index e7b05813e..cece96e18 100644 --- a/src/com/engine/salary/biz/SpecialAddDeductionBiz.java +++ b/src/com/engine/salary/biz/SpecialAddDeductionBiz.java @@ -160,7 +160,7 @@ public class SpecialAddDeductionBiz extends BaseBean { public List getByEmployeeId(List employeeIds, Long taxAgentId) { if (CollectionUtils.isEmpty(employeeIds)) { - return Collections.emptyList(); + employeeIds = Collections.emptyList(); } return mapper().getByEmployeeIds(employeeIds, taxAgentId) .stream() diff --git a/src/com/engine/salary/mapper/datacollection/SpecialAddDeductionMapper.xml b/src/com/engine/salary/mapper/datacollection/SpecialAddDeductionMapper.xml index 37c5a765a..f343b7371 100644 --- a/src/com/engine/salary/mapper/datacollection/SpecialAddDeductionMapper.xml +++ b/src/com/engine/salary/mapper/datacollection/SpecialAddDeductionMapper.xml @@ -565,14 +565,14 @@ select from hrsa_special_add_deduction t1 - where - - 1 = 2 - - - #{employeeId} - - and tax_agent_id = #{taxAgentId} - and delete_type = 0 + + + + #{employeeId} + + + and tax_agent_id = #{taxAgentId} + and delete_type = 0 + \ No newline at end of file diff --git a/src/com/engine/salary/service/impl/AddUpDeductionServiceImpl.java b/src/com/engine/salary/service/impl/AddUpDeductionServiceImpl.java index b3c97fa62..b29cf4b8e 100644 --- a/src/com/engine/salary/service/impl/AddUpDeductionServiceImpl.java +++ b/src/com/engine/salary/service/impl/AddUpDeductionServiceImpl.java @@ -656,7 +656,7 @@ public class AddUpDeductionServiceImpl extends Service implements AddUpDeduction Collection employeeIds = getTaxAgentService(user) .listEmployeeIdsInTaxAgent(taxAgent.getId()); List employeePOs = getSpecialAddDeductionService(user) - .getSpecialAddDeductionPOByEmployee(new ArrayList<>(employeeIds), taxAgent.getId()); + .getSpecialAddDeductionPOByEmployee(null, taxAgent.getId()); //获取上月员工数据,用于累加 LocalDateTime lastMonthDateTime = LocalDateTime.now().minusMonths(1);