From 040c3ed88653f708cd00907929c190754d319392 Mon Sep 17 00:00:00 2001
From: chenshaoxin <1981897232@qq.com>
Date: Mon, 19 May 2025 11:02:09 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BA=BA=EF=BC=9A=E9=99=88?=
 =?UTF-8?q?=E7=BB=8D=E9=91=AB=20=E6=97=A5=E6=9C=9F=EF=BC=9A2025/5/19=2010?=
 =?UTF-8?q?=EF=BC=9A30=20=E5=86=85=E5=AE=B9:=E7=90=86=E8=B4=A2=E6=94=B6?=
 =?UTF-8?q?=E7=9B=8A=E6=98=8E=E7=BB=86=E8=A1=A8=E6=8B=93=E5=B1=95=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E6=8F=92=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sys/sys/plugin/operation/BankSaveOP.java  | 32 +++++++++++--------
 1 file changed, 19 insertions(+), 13 deletions(-)

diff --git a/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/operation/BankSaveOP.java b/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/operation/BankSaveOP.java
index 221f119..cee4318 100644
--- a/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/operation/BankSaveOP.java
+++ b/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/operation/BankSaveOP.java
@@ -61,7 +61,7 @@ public class BankSaveOP extends AbstractOperationServicePlugIn {
                     if (qFilter==null){
                         qFilter=qFilter1;
                     }else {
-                        qFilter.or(qFilter1);
+                        qFilter=qFilter.or(qFilter1);
                     }
 
                 }
@@ -77,23 +77,29 @@ public class BankSaveOP extends AbstractOperationServicePlugIn {
 
                     DynamicObject dynamicObject = dataEntities[i];
                     String description = dynamicObject.getString("description");
-                    String sql = qFilter.toString();
-                    String replaced = sql.replace("description", "'"+description+"'");
-                    String selsql = " /*dialect*/ select 1 where "+replaced;
-                    DataSet res = DB.queryDataSet(this.getClass().getSimpleName(), DBRoute.of("fi"), selsql);//财务云
-                    DynamicObjectCollection srcCollection = ORM.create().toPlainDynamicObjectCollection(res.copy());
-                    if (srcCollection.size()!=0){
-                        try {
-                            dynamicObject.set("kdretflag", null);  //数据赋值
-                        } catch (Exception ex) {
-                            logger.info("进入banksavef方法直接赋值失败");
+                    if (qFilter!=null){
+                        String sql = qFilter.toString();
+                        String replaced = sql.replace("description", "'"+description+"'");
+                        String selsql = " /*dialect*/ select 1 where "+replaced;
+                        DataSet res = DB.queryDataSet(this.getClass().getSimpleName(), DBRoute.of("fi"), selsql);//财务云
+                        DynamicObjectCollection srcCollection = ORM.create().toPlainDynamicObjectCollection(res.copy());
+                        if (srcCollection.size()!=0){
+                            try {
+                                dynamicObject.set("kdretflag", null);  //数据赋值
+                            } catch (Exception ex) {
+                                logger.info("进入banksavef方法直接赋值失败");
+                            }
                         }
                     }
-
                     if(dynamicObject != null) {
                         //通过基础资料或单据标识 的id 获取数据
                         QFilter newqFilter =new QFilter("id", QCP.equals,dynamicObject.getPkValue());
-                        qFilter.and(newqFilter);
+                        if (qFilter!=null){
+                            qFilter=qFilter.and(newqFilter);
+                        }else {
+                            qFilter=newqFilter;
+                        }
+//                        qFilter.and(newqFilter);
 //                        DynamicObject bei_transdetail = BusinessDataServiceHelper.loadSingle(dynamicObject.getPkValue(), "bei_transdetail");
                         DynamicObject bei_transdetail = BusinessDataServiceHelper.loadSingle("bei_transdetail", "id,billno,description,kdretflag", qFilter.toArray());
                         if(bei_transdetail != null ) {