qt
/
weaver-hrm-salary
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

领悦数据库兼容问题修复

This commit is contained in:
Harryxzy 2025-04-15 10:08:19 +08:00
parent 649f8c2432
commit b2e82f7f83
1 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/com/engine/salary/service/impl/LySalaryReportServiceImpl.java
View File

@ -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<Long> 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<Long> 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<LySalaryReportPO> 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());
}
// 分权