From ca1ba6234843526ac00aab1e201b71f2537cd447 Mon Sep 17 00:00:00 2001
From: yuxueliang0813 <407010292@qq.com>
Date: Wed, 2 Jul 2025 18:34:54 +0800
Subject: [PATCH] =?UTF-8?q?if=E6=94=B6=E6=AC=BE=E9=93=B6=E8=A1=8C=3D?=
 =?UTF-8?q?=E5=B7=A5=E5=95=86=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=20=E5=8C=85=E5=90=AB?=
 =?UTF-8?q?=E2=80=9C=E5=B7=A5=E5=95=86=E9=93=B6=E8=A1=8C=E2=80=9D=E6=88=96?=
 =?UTF-8?q?=E2=80=9C=E5=B7=A5=E8=A1=8C=E2=80=9D=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=3D102100004951,=E4=B8=AD=E5=9B=BD=E5=B7=A5=E5=95=86?=
 =?UTF-8?q?=E9=93=B6=E8=A1=8C=E6=80=BB=E8=A1=8C=E8=90=A5=E4=B8=9A=E9=83=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../shjh/jhzj7/fi/fi/plugin/task/PersonCustomerBankTask.java   | 3 ++-
 main/java/shjh/jhzj7/fi/fi/webapi/PersonControler.java         | 3 ++-
 2 files changed, 4 insertions(+), 2 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 2fd64f1..ac5ba79 100644
--- a/main/java/shjh/jhzj7/fi/fi/plugin/task/PersonCustomerBankTask.java
+++ b/main/java/shjh/jhzj7/fi/fi/plugin/task/PersonCustomerBankTask.java
@@ -74,7 +74,8 @@ public class PersonCustomerBankTask extends AbstractTask implements Plugin {
                 bebankinfo = null;
             }
             if(bebankinfo == null){
-                if(xxyh != null && "工商银行".equals(xxyh.trim()) && skyh != null && "工商银行".equals(skyh.trim())){
+                //if收款银行=工商银行 and 详细分机银行 包含“工商银行”或“工行”，then 客户-员工-开户银行=102100004951,中国工商银行总行营业部
+                if(xxyh != null && (xxyh.contains("工商银行") || xxyh.contains("工行")) && skyh != null && "工商银行".equals(skyh.trim())){
                     bebankinfo = gsbankinfo;
                 }else if(xxyh != null && (xxyh.contains("建设银行") || xxyh.contains("建行")) && skyh != null && "建设银行".equals(skyh.trim())){
                     bebankinfo = jsbankinfo;
diff --git a/main/java/shjh/jhzj7/fi/fi/webapi/PersonControler.java b/main/java/shjh/jhzj7/fi/fi/webapi/PersonControler.java
index 7cf7d2f..e720ce3 100644
--- a/main/java/shjh/jhzj7/fi/fi/webapi/PersonControler.java
+++ b/main/java/shjh/jhzj7/fi/fi/webapi/PersonControler.java
@@ -311,7 +311,8 @@ public class PersonControler implements Serializable {
                 bebankinfo = null;
             }
             if(bebankinfo == null){
-                if(xxyh != null && "工商银行".equals(xxyh.trim()) && skyh != null && "工商银行".equals(skyh.trim())){
+                //if收款银行=工商银行 and 详细分机银行 包含“工商银行”或“工行”，then 客户-员工-开户银行=102100004951,中国工商银行总行营业部
+                if(xxyh != null && (xxyh.contains("工商银行") || xxyh.contains("工行")) && skyh != null && "工商银行".equals(skyh.trim())){
                     bebankinfo = gsbankinfo;
                 }else if(xxyh != null && (xxyh.contains("建设银行") || xxyh.contains("建行")) && skyh != null && "建设银行".equals(skyh.trim())){
                     bebankinfo = jsbankinfo;