diff --git a/src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java b/src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java index 5d2c61189..2a6813257 100644 --- a/src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java +++ b/src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java @@ -41,6 +41,7 @@ import com.engine.salary.util.excel.ExcelUtil; import com.engine.salary.util.page.PageInfo; import com.engine.salary.util.page.SalaryPageUtil; import com.engine.salary.util.valid.ValidUtil; +import com.google.common.base.Joiner; import com.google.common.collect.Lists; import com.google.common.collect.Maps; import dm.jdbc.util.IdGenerator; diff --git a/src/com/engine/salary/service/impl/SalarySendServiceImpl.java b/src/com/engine/salary/service/impl/SalarySendServiceImpl.java index dc19ef250..e9126f8a6 100644 --- a/src/com/engine/salary/service/impl/SalarySendServiceImpl.java +++ b/src/com/engine/salary/service/impl/SalarySendServiceImpl.java @@ -482,21 +482,6 @@ public class SalarySendServiceImpl extends Service implements SalarySendService return new PageInfo<>(); } } - - //查询关联的核酸id,这里认为一次发放只对应一条核算记录 - Long salaryAccRecordId = - salarySendInfoMapper.listSalaryAccRecordIds(queryParam).stream().findFirst().orElse(null); - // 查询合并计税的其他薪资核算记录 - List otherSalaryAcctRecordPOS = - getSalaryAcctRecordService(user).listById4OtherConsolidatedTax(salaryAccRecordId); - if (CollectionUtils.isEmpty(otherSalaryAcctRecordPOS)) { - return new PageInfo<>(); - } - // 查询合并计税的薪资核算人员 - Set otherSalaryAcctRecordIds = SalaryEntityUtil.properties(otherSalaryAcctRecordPOS, SalaryAcctRecordPO::getId); - if (otherSalaryAcctRecordIds.isEmpty()) { - return new PageInfo<>(); - } SalaryPageUtil.start(queryParam.getCurrent(), queryParam.getPageSize()); List list = salarySendInfoMapper.detailList(queryParam, otherSalaryAcctRecordIds); PageInfo pageInfo = new PageInfo<>(list, SalarySendDetailListDTO.class);