diff --git a/src/com/engine/salary/service/impl/LySalaryReportServiceImpl.java b/src/com/engine/salary/service/impl/LySalaryReportServiceImpl.java index 800ff069a..4186aaff1 100644 --- a/src/com/engine/salary/service/impl/LySalaryReportServiceImpl.java +++ b/src/com/engine/salary/service/impl/LySalaryReportServiceImpl.java @@ -527,8 +527,8 @@ public class LySalaryReportServiceImpl extends Service implements LySalaryReport .filter(po -> canManageFrztByUid.contains(po.getFfgsqc()) || canManageSubCompanyIds.contains(po.getSubcompanyId())) .collect(Collectors.toList()); } - if (CollectionUtils.isNotEmpty(param.getFycdgsqc())) { - lySalaryReportPOS = lySalaryReportPOS.stream().filter(lySalaryReportPO -> param.getFycdgsqc().contains(lySalaryReportPO.getFfgsqc())).collect(Collectors.toList()); + if (CollectionUtils.isNotEmpty(param.getFfgsqc())) { + lySalaryReportPOS = lySalaryReportPOS.stream().filter(lySalaryReportPO -> param.getFfgsqc().contains(lySalaryReportPO.getFfgsqc())).collect(Collectors.toList()); } // 费用承担公司 if (CollectionUtils.isNotEmpty(param.getFycdgsqc())) { @@ -611,17 +611,18 @@ public class LySalaryReportServiceImpl extends Service implements LySalaryReport return resultList; } RecordSet rs = new RecordSet(); - String sql = "select subcomid,ncbbckqxry from hrmsubcompanydefined where ncbbckqxry is not null and ncbbckqxry != ''"; + String sql = "select subcomid,ncbbckqxry from hrmsubcompanydefined where ncbbckqxry is not null"; rs.executeQuery(sql); while (rs.next()) { String ncbbckqxryStr = rs.getString("ncbbckqxry"); - - List empIds = Arrays.stream(ncbbckqxryStr.split(",")) - .filter(NumberUtils::isCreatable) - .map(Long::valueOf) - .collect(Collectors.toList()); - if (empIds.contains(uid)) { - resultList.add(Long.valueOf(rs.getInt("subcomid"))); + if (StringUtils.isNotBlank(ncbbckqxryStr)) { + List empIds = Arrays.stream(ncbbckqxryStr.split(",")) + .filter(NumberUtils::isCreatable) + .map(Long::valueOf) + .collect(Collectors.toList()); + if (empIds.contains(uid)) { + resultList.add(Long.valueOf(rs.getInt("subcomid"))); + } } } return resultList; @@ -719,8 +720,8 @@ public class LySalaryReportServiceImpl extends Service implements LySalaryReport // 获取本月是否已有报表数据 List lySalaryReportPOS = listBySalaryMonth(salaryMonthDate); - if (CollectionUtils.isNotEmpty(param.getFycdgsqc())) { - lySalaryReportPOS = lySalaryReportPOS.stream().filter(lySalaryReportPO -> param.getFycdgsqc().contains(lySalaryReportPO.getFfgsqc())).collect(Collectors.toList()); + if (CollectionUtils.isNotEmpty(param.getFfgsqc())) { + lySalaryReportPOS = lySalaryReportPOS.stream().filter(lySalaryReportPO -> param.getFfgsqc().contains(lySalaryReportPO.getFfgsqc())).collect(Collectors.toList()); } // 分权