From f2ce70756437453e4eb41ec952d24aaa0095be4b Mon Sep 17 00:00:00 2001
From: yulin <240160934@qq.com>
Date: Thu, 11 Jan 2024 15:52:52 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B8=A6=E5=87=BA=E4=B8=8A=E6=9C=9F=E5=A1=AB?=
 =?UTF-8?q?=E6=8A=A5=E6=95=B0=E6=8D=AE=20=E5=8F=AA=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E5=B7=B2=E6=8E=A8=E9=80=81=E7=9A=84=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../smtweb/biz/mztb/web/base/partyDataFill/PartyDataFillHandler.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mztb/src/main/java/cc/smtweb/biz/mztb/web/base/partyDataFill/PartyDataFillHandler.java b/mztb/src/main/java/cc/smtweb/biz/mztb/web/base/partyDataFill/PartyDataFillHandler.java
index a95088d..9edd8b8 100644
--- a/mztb/src/main/java/cc/smtweb/biz/mztb/web/base/partyDataFill/PartyDataFillHandler.java
+++ b/mztb/src/main/java/cc/smtweb/biz/mztb/web/base/partyDataFill/PartyDataFillHandler.java
@@ -108,11 +108,11 @@ public class PartyDataFillHandler {
 
 //            bean.setUser(us.getUserId());
             if(params.readString("outOldData").equals("1")) { // 如果带出上期数据,并且能找到最近的数据 就不执行初始化
-                // 通过填报类型 找到当前机构最近填报的一条数据，
+                // 通过填报类型 已推送 找到当前机构最近填报的一条数据，
                 int state  = params.readInt("type") == 1 ? 1 : 2;
                 String foIdStr = instance.queryString("select fo_id from "
                         + EntityHelper.getSchemaTableName(FillOut.ENTITY_NAME)
-                        + " where fo_type = ? and fo_party_id=? order by fo_date desc limit 1",state,params.readLong("CUR_PARTY_ID"));
+                        + " where fo_type = ? and fo_state = 2 and fo_party_id=? order by fo_date desc limit 1",state,params.readLong("CUR_PARTY_ID"));
                 // 查询 关联表的数据
                 if(StringUtil.isEmpty(foIdStr)) { // 如果未找到同类型的填报数据 直接构建初始化数据
                     initPageDateset();