From 04f05281433eed25d06aff7ac8b7b702a265b898 Mon Sep 17 00:00:00 2001
From: Harryxzy <xuzhuoyan_xzy@163.com>
Date: Tue, 27 Jun 2023 18:00:39 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=B8=8B=E8=BD=BD=E8=96=AA?=
 =?UTF-8?q?=E8=B5=84=E6=A1=A3=E6=A1=88=E6=A8=A1=E6=9D=BF=E6=B2=A1=E6=9C=89?=
 =?UTF-8?q?=E5=B8=A6=E5=87=BA=E6=A1=A3=E6=A1=88=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../engine/salary/service/impl/SalaryArchiveServiceImpl.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java b/src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java
index 1dcf84c18..952b24b60 100644
--- a/src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java
+++ b/src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java
@@ -390,7 +390,7 @@ public class SalaryArchiveServiceImpl extends Service implements SalaryArchiveSe
         List<Long> salaryItemIds = salaryItems.stream().map(SalaryItemPO::getId).collect(Collectors.toList());
         // 1.获取薪资档案所对应的当前生效的薪资项目数据
         List<SalaryArchiveItemPO> salaryArchiveItemList = Collections.emptyList();
-        if(CollectionUtils.isNotEmpty(ids) && CollectionUtils.isNotEmpty(salaryItemIds)){
+        if(CollectionUtils.isNotEmpty(ids) && CollectionUtils.isNotEmpty(salaryItemIds) || !isPage){
             salaryArchiveItemList = getCurrentEffectiveItemList(ids, salaryItemIds);
         }
         List<SalaryArchiveItemPO> finalSalaryArchiveItemList = salaryArchiveItemList;