From 0837b56174539490ea72b89cf87a641b9c0bd69b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com> Date: Tue, 17 Mar 2026 17:38:51 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E8=96=AA=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../salary/service/impl/SalaryArchiveExcelServiceImpl.java | 2 +- .../salary/service/impl/SalaryArchiveItemServiceImpl.java | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/com/engine/salary/service/impl/SalaryArchiveExcelServiceImpl.java b/src/com/engine/salary/service/impl/SalaryArchiveExcelServiceImpl.java index 16723a545..eeddf63b9 100644 --- a/src/com/engine/salary/service/impl/SalaryArchiveExcelServiceImpl.java +++ b/src/com/engine/salary/service/impl/SalaryArchiveExcelServiceImpl.java @@ -634,7 +634,6 @@ public class SalaryArchiveExcelServiceImpl extends Service implements SalaryArch // 4.数据入库处理 if (param.isAddData()) { handleImportData(importHandleParam); - log.info("processInit4 handleImportData:{}", importHandleParam); } Map apidatas = new HashMap<>(); @@ -664,6 +663,7 @@ public class SalaryArchiveExcelServiceImpl extends Service implements SalaryArch String importType = param.getImportType(); // 获取所有可被引用的薪资项目 + log.info("getCanAdjustSalaryItems param:{}", param); List salaryItems = salaryArchiveItemService(user).getCanAdjustSalaryItems(); Collection salaryItemIds = salaryItems.stream().map(SalaryItemPO::getId).collect(Collectors.toList()); Collection taxAgentList; diff --git a/src/com/engine/salary/service/impl/SalaryArchiveItemServiceImpl.java b/src/com/engine/salary/service/impl/SalaryArchiveItemServiceImpl.java index e8465791f..a8c4da3d6 100644 --- a/src/com/engine/salary/service/impl/SalaryArchiveItemServiceImpl.java +++ b/src/com/engine/salary/service/impl/SalaryArchiveItemServiceImpl.java @@ -639,11 +639,13 @@ public class SalaryArchiveItemServiceImpl extends Service implements SalaryArchi List taxAgentIds = SalaryEntityUtil.properties(taxAgentList, TaxAgentPO::getId, Collectors.toList()); List canAdjustSalaryItems = salaryItemMapper.getCanAdjustSalaryItems(); + log.info("getCanAdjustSalaryItems1:{}", canAdjustSalaryItems); canAdjustSalaryItems = canAdjustSalaryItems.stream() .filter(item -> item.getSharedType() == null || 0 == item.getSharedType() || (StringUtils.isNotBlank(item.getTaxAgentIds()) && SalaryEntityUtil.judgeIntersection(taxAgentIds, Arrays.stream(item.getTaxAgentIds().split(",")).map(Long::valueOf).collect(Collectors.toList())))) .collect(Collectors.toList()); + log.info("getCanAdjustSalaryItems2:{} taxAgentIds:{}", canAdjustSalaryItems, taxAgentIds); return canAdjustSalaryItems; }