From 1b27ed68befd4aa02b7201733e54509d0e92426d Mon Sep 17 00:00:00 2001
From: Harryxzy <xuzhuoyan_xzy@163.com>
Date: Fri, 25 Apr 2025 15:56:16 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A2=86=E6=82=A6=E6=B3=95=E4=BA=BA=E4=B8=BB?=
 =?UTF-8?q?=E4=BD=93=E5=A2=9E=E5=8A=A0=E6=98=AF=E5=90=A6=E5=90=AF=E7=94=A8?=
 =?UTF-8?q?=E7=AD=9B=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/com/engine/salary/service/impl/LyPZServiceImpl.java       | 4 ++--
 .../engine/salary/service/impl/LySalaryReportServiceImpl.java | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

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<List<String>> partition = Lists.partition(frztNameList, 500);
         List<LyFzhsInfo> 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<String, String> listAllFrzt() {
         RecordSet rs = new RecordSet();
         Map<String, String> 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<String, List<Long>> frztInfoMap = new HashMap<>();
         while (rs.next()) {
             String frzt = rs.getString("frzt");