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()){