From d219d129a59208917697725b9b273d682887b15e Mon Sep 17 00:00:00 2001
From: sy <sy666666>
Date: Fri, 4 Aug 2023 14:14:44 +0800
Subject: [PATCH] =?UTF-8?q?=E8=96=AA=E9=85=AC=E7=B3=BB=E7=BB=9F-=E7=A6=8F?=
 =?UTF-8?q?=E5=88=A9=E5=8F=B0=E8=B4=A6=EF=BC=8C=E5=8F=B0=E8=B4=A6=E6=98=8E?=
 =?UTF-8?q?=E7=BB=86=E5=AF=BC=E5=85=A5=E6=A8=A1=E6=9D=BF=E8=87=AA=E5=AE=9A?=
 =?UTF-8?q?=E4=B9=89=E5=AF=BC=E5=85=A5=E5=AD=97=E6=AE=B5=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/com/engine/salary/service/impl/SIAccountServiceImpl.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/com/engine/salary/service/impl/SIAccountServiceImpl.java b/src/com/engine/salary/service/impl/SIAccountServiceImpl.java
index 15ced811c..c28d12ebb 100644
--- a/src/com/engine/salary/service/impl/SIAccountServiceImpl.java
+++ b/src/com/engine/salary/service/impl/SIAccountServiceImpl.java
@@ -37,6 +37,7 @@ import com.engine.salary.enums.UserStatusEnum;
 import com.engine.salary.enums.datacollection.UseEmployeeTypeEnum;
 import com.engine.salary.enums.siaccount.*;
 import com.engine.salary.enums.sicategory.DeleteTypeEnum;
+import com.engine.salary.enums.sicategory.IsUseEnum;
 import com.engine.salary.enums.sicategory.WelfareTypeEnum;
 import com.engine.salary.exception.SalaryRunTimeException;
 import com.engine.salary.mapper.InsuranceExportMapper;
@@ -1092,7 +1093,7 @@ public class SIAccountServiceImpl extends Service implements SIAccountService {
 
     @Override
     public Map<String, String> welfareColumns() {
-        List<ICategoryPO> listAll = getICategoryMapper().listAll();
+        List<ICategoryPO> listAll = getICategoryMapper().listAll().stream().filter(f -> f.getIsUse().equals(IsUseEnum.START.getValue())).collect(Collectors.toList());
         List<ICategoryPO> list = new ArrayList<>();
         if (CollectionUtils.isNotEmpty(listAll)) {
             list.addAll(listAll);