From daba6aeca0f1c66da94509974dbaa714ec354ae1 Mon Sep 17 00:00:00 2001
From: yuxueliang0813 <407010292@qq.com>
Date: Mon, 30 Jun 2025 18:43:36 +0800
Subject: [PATCH] =?UTF-8?q?if=E6=94=B6=E6=AC=BE=E9=93=B6=E8=A1=8C=3D?=
 =?UTF-8?q?=E5=BB=BA=E8=AE=BE=E9=93=B6=E8=A1=8C=20and=20=E8=AF=A6=E7=BB=86?=
 =?UTF-8?q?=E5=88=86=E6=9C=BA=E9=93=B6=E8=A1=8C=E5=8C=85=E5=90=AB=E2=80=9C?=
 =?UTF-8?q?=E5=BB=BA=E8=AE=BE=E9=93=B6=E8=A1=8C=E2=80=9D=E6=88=96=E2=80=9C?=
 =?UTF-8?q?=E5=BB=BA=E8=A1=8C=E2=80=9D=E4=B8=94=E8=A1=8C=E5=90=8D=E8=A1=8C?=
 =?UTF-8?q?=E5=8F=B7=E4=B8=BA=E7=A9=BA=E7=9A=84=EF=BC=8Cthen=20=E5=AE=A2?=
 =?UTF-8?q?=E6=88=B7-=E5=91=98=E5=B7=A5-=E5=BC=80=E6=88=B7=E9=93=B6?=
 =?UTF-8?q?=E8=A1=8C=3D105100000017,=E4=B8=AD=E5=9B=BD=E5=BB=BA=E8=AE=BE?=
 =?UTF-8?q?=E9=93=B6=E8=A1=8C=E6=80=BB=E8=A1=8Css?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../fi/fi/plugin/task/PersonCustomerBankTask.java   | 13 ++++++++-----
 .../shjh/jhzj7/fi/fi/webapi/PersonControler.java    | 13 ++++++++-----
 2 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/main/java/shjh/jhzj7/fi/fi/plugin/task/PersonCustomerBankTask.java b/main/java/shjh/jhzj7/fi/fi/plugin/task/PersonCustomerBankTask.java
index 0ab682c..5b781d1 100644
--- a/main/java/shjh/jhzj7/fi/fi/plugin/task/PersonCustomerBankTask.java
+++ b/main/java/shjh/jhzj7/fi/fi/plugin/task/PersonCustomerBankTask.java
@@ -61,16 +61,19 @@ public class PersonCustomerBankTask extends AbstractTask implements Plugin {
             //根据详细分机银行 查找对应的行名行号
             DynamicObject bebankinfo;
             //建设银行的员工：开户银行统一放在：105100000017 中国建设银行总行
-            if(xxyh != null && ("建设银行".equals(xxyh.trim()) || "建行".equals(xxyh.trim())) && skyh != null && "建设银行".equals(skyh.trim())){
-                bebankinfo = jsbankinfo;
-            }else if(xxyh != null && "工商银行".equals(xxyh.trim()) && skyh != null && "工商银行".equals(skyh.trim())){
-                bebankinfo = gsbankinfo;
-            }else if(xxyh != null){
+            if(xxyh != null){
                 bebankinfo = BusinessDataServiceHelper.loadSingleFromCache(bebankName,"id,number,name",
                         new QFilter[]{new QFilter("name","=",xxyh)});
             }else{
                 bebankinfo = null;
             }
+            if(bebankinfo == null){
+                if(xxyh != null && "工商银行".equals(xxyh.trim()) && skyh != null && "工商银行".equals(skyh.trim())){
+                    bebankinfo = gsbankinfo;
+                }else if(xxyh != null && (xxyh.contains("建设银行") || xxyh.contains("建行")) && skyh != null && "建设银行".equals(skyh.trim())){
+                    bebankinfo = jsbankinfo;
+                }
+            }
             String cusname = ups.getString("name");//姓名
             DynamicObject bankinfo = doc_bank.addNew();
             bankinfo.set("isdefault_bank",true);
diff --git a/main/java/shjh/jhzj7/fi/fi/webapi/PersonControler.java b/main/java/shjh/jhzj7/fi/fi/webapi/PersonControler.java
index 4c25d1f..7cf7d2f 100644
--- a/main/java/shjh/jhzj7/fi/fi/webapi/PersonControler.java
+++ b/main/java/shjh/jhzj7/fi/fi/webapi/PersonControler.java
@@ -304,16 +304,19 @@ public class PersonControler implements Serializable {
             //根据详细分机银行 查找对应的行名行号
             DynamicObject bebankinfo;
             //建设银行的员工：开户银行统一放在：105100000017 中国建设银行总行
-            if(xxyh != null && ("建设银行".equals(xxyh.trim()) || "建行".equals(xxyh.trim())) && skyh != null && "建设银行".equals(skyh.trim())){
-                bebankinfo = jsbankinfo;
-            }else if(xxyh != null && "工商银行".equals(xxyh.trim()) && skyh != null && "工商银行".equals(skyh.trim())){
-                bebankinfo = gsbankinfo;
-            }else if(xxyh != null){
+            if(xxyh != null){
                 bebankinfo = BusinessDataServiceHelper.loadSingleFromCache(bebankName,"id,number,name",
                         new QFilter[]{new QFilter("name","=",xxyh)});
             }else{
                 bebankinfo = null;
             }
+            if(bebankinfo == null){
+                if(xxyh != null && "工商银行".equals(xxyh.trim()) && skyh != null && "工商银行".equals(skyh.trim())){
+                    bebankinfo = gsbankinfo;
+                }else if(xxyh != null && (xxyh.contains("建设银行") || xxyh.contains("建行")) && skyh != null && "建设银行".equals(skyh.trim())){
+                    bebankinfo = jsbankinfo;
+                }
+            }
             DynamicObjectCollection doc_bank = currentCus.getDynamicObjectCollection("entry_bank");
             DynamicObject bankinfo;
             if(doc_bank.isEmpty()){