diff --git a/src/com/engine/salary/wrapper/SalarySendWrapper.java b/src/com/engine/salary/wrapper/SalarySendWrapper.java index 0fccfecd0..cce4f5e1e 100644 --- a/src/com/engine/salary/wrapper/SalarySendWrapper.java +++ b/src/com/engine/salary/wrapper/SalarySendWrapper.java @@ -1,5 +1,6 @@ package com.engine.salary.wrapper; +import cn.hutool.core.util.NumberUtil; import cn.hutool.core.util.ObjectUtil; import com.api.browser.bean.SearchConditionGroup; import com.api.browser.bean.SearchConditionItem; @@ -45,6 +46,7 @@ import org.apache.commons.lang3.math.NumberUtils; import org.apache.ibatis.session.SqlSession; import org.apache.poi.xssf.usermodel.XSSFWorkbook; import weaver.conn.mybatis.MyBatisFactory; +import weaver.general.BaseBean; import weaver.hrm.User; import java.text.ParseException; @@ -137,6 +139,14 @@ public class SalarySendWrapper extends Service implements SalarySendWrapperProxy } }); + // 过滤离职账套的工资单 + BaseBean baseBean = new BaseBean(); + List resignationSobIds = Arrays.asList(baseBean.getPropValue("nbjhSalary", "dimissionSobIds").split(",")) + .stream() + .filter(NumberUtil::isNumber) + .map(Long::valueOf).collect(Collectors.toList()); + list = list.stream().filter(e -> !resignationSobIds.contains(e.getSalarySobId())).collect(Collectors.toList()); + PageInfo pageInfo = SalaryPageUtil.buildPage(queryParam.getCurrent(), queryParam.getPageSize(), list, SalarySendListDTO.class); List pageList = pageInfo.getList();