From fbce286c17c8bb1950a8b9be2fb1ccac18ee15d2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com>
Date: Thu, 18 Sep 2025 16:31:58 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=AD=97=E6=AE=B5=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E5=88=86=E6=9D=83=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../salary/service/impl/SalaryArchiveItemServiceImpl.java      | 2 --
 .../engine/salary/service/impl/SalaryArchiveServiceImpl.java   | 2 +-
 src/com/engine/salary/wrapper/SalaryArchiveWrapper.java        | 3 ---
 3 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/src/com/engine/salary/service/impl/SalaryArchiveItemServiceImpl.java b/src/com/engine/salary/service/impl/SalaryArchiveItemServiceImpl.java
index 9e353083e..ea78bfd74 100644
--- a/src/com/engine/salary/service/impl/SalaryArchiveItemServiceImpl.java
+++ b/src/com/engine/salary/service/impl/SalaryArchiveItemServiceImpl.java
@@ -656,8 +656,6 @@ public class SalaryArchiveItemServiceImpl extends Service implements SalaryArchi
     public XSSFWorkbook exportAdjustRecordList(SalaryItemAdjustRecordQueryParam queryParam) {
         // 1.工作簿名称
         String sheetName = SalaryI18nUtil.getI18nLabel(85368, "薪资项目调整记录");
-        // 获取所有可被引用的薪资项目
-        List<SalaryItemPO> salaryItems = salaryItemMapper.getCanAdjustSalaryItems();
         String[] header = {
                 SalaryI18nUtil.getI18nLabel(85429, "姓名"),
                 SalaryI18nUtil.getI18nLabel(86187, "员工状态"),
diff --git a/src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java b/src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java
index ceab506eb..3e04c95da 100644
--- a/src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java
+++ b/src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java
@@ -543,7 +543,7 @@ public class SalaryArchiveServiceImpl extends Service implements SalaryArchiveSe
         // 1.工作簿名称
         String sheetName = SalaryI18nUtil.getI18nLabel(85368, "薪资档案");
         // 获取所有可被引用的薪资项目
-        List<SalaryItemPO> salaryItems = salaryItemMapper.getCanAdjustSalaryItems();
+        List<SalaryItemPO> salaryItems = getSalaryArchiveItemService(user).getCanAdjustSalaryItems();
         Object[] header = {
                 new WeaTableColumnGroup("150px", SalaryI18nUtil.getI18nLabel(85429, "姓名"), "", "", 0),
                 new WeaTableColumnGroup("150px", SalaryI18nUtil.getI18nLabel(86184, "个税扣缴义务人"), "", "", 0),
diff --git a/src/com/engine/salary/wrapper/SalaryArchiveWrapper.java b/src/com/engine/salary/wrapper/SalaryArchiveWrapper.java
index 85977afe1..38de24e1a 100644
--- a/src/com/engine/salary/wrapper/SalaryArchiveWrapper.java
+++ b/src/com/engine/salary/wrapper/SalaryArchiveWrapper.java
@@ -541,9 +541,6 @@ public class SalaryArchiveWrapper extends Service {
         return map;
     }
 
-    public Map<String, Object> selectSalaryArchiveColumns(String importType) {
-        return getSalaryArchiveService(user).selectSalaryArchiveColumns(SalaryArchiveImportTypeEnum.parseByValue(importType));
-    }
 
 
     public Map<String, Object> checkSalaryArchiveInit(SalaryArchiveImportActionParam importData) {