diff --git a/src/com/engine/salary/service/impl/LyPZServiceImpl.java b/src/com/engine/salary/service/impl/LyPZServiceImpl.java index 390905629..3971c2466 100644 --- a/src/com/engine/salary/service/impl/LyPZServiceImpl.java +++ b/src/com/engine/salary/service/impl/LyPZServiceImpl.java @@ -425,7 +425,7 @@ public class LyPZServiceImpl extends Service implements LyPZService { List> partition = Lists.partition(frztNameList, 500); List resultList = new ArrayList<>(); partition.forEach(part -> { - rs.execute("select frzt,sllb,ks,yxzh,nczb from uf_frzt where frzt in ('" +StringUtils.join(part, "','")+ "')"); + rs.execute("select frzt,sllb,ks,yxzh,nczb from uf_frzt where (sfqy =0 or sfqy is null) and frzt in ('" +StringUtils.join(part, "','")+ "')"); while (rs.next()) { String frzt = rs.getString("frzt"); String sllb = rs.getString("sllb"); @@ -453,7 +453,7 @@ public class LyPZServiceImpl extends Service implements LyPZService { public Map listAllFrzt() { RecordSet rs = new RecordSet(); Map resultMap = new HashMap<>(); - rs.execute("select id,frzt from uf_frzt "); + rs.execute("select id,frzt from uf_frzt where sfqy =0 or sfqy is null"); while (rs.next()) { String frzt = rs.getString("frzt"); String id = rs.getString("id"); diff --git a/src/com/engine/salary/service/impl/LySalaryReportServiceImpl.java b/src/com/engine/salary/service/impl/LySalaryReportServiceImpl.java index fa5df20c5..bc9574acb 100644 --- a/src/com/engine/salary/service/impl/LySalaryReportServiceImpl.java +++ b/src/com/engine/salary/service/impl/LySalaryReportServiceImpl.java @@ -943,7 +943,7 @@ public class LySalaryReportServiceImpl extends Service implements LySalaryReport return Collections.emptyList(); } RecordSet rs = new RecordSet(); - rs.execute("select frzt,ncbbqxry from uf_frzt "); + rs.execute("select frzt,ncbbqxry from uf_frzt where sfqy =0 or sfqy is null"); HashMap> frztInfoMap = new HashMap<>(); while (rs.next()) { String frzt = rs.getString("frzt");