From e8d228de8e5d3db9b2ccd9367358db323f71dee0 Mon Sep 17 00:00:00 2001 From: "zzs01@yunemao.com" Date: Tue, 10 Sep 2024 14:36:51 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E8=B4=B7=E8=AE=B0=E5=8D=95=E6=8F=90?= =?UTF-8?q?=E4=BA=A4=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit 6db339b94f12d43af9b6f3e8b8a77ae552de84d1) --- .../validator/DebCredNewAuditValidatorOp.java | 22 +++++++++++-------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/src/main/java/com/yem/wm/im/debcrednotenew/validator/DebCredNewAuditValidatorOp.java b/src/main/java/com/yem/wm/im/debcrednotenew/validator/DebCredNewAuditValidatorOp.java index f9e5ad47..807ed6a9 100644 --- a/src/main/java/com/yem/wm/im/debcrednotenew/validator/DebCredNewAuditValidatorOp.java +++ b/src/main/java/com/yem/wm/im/debcrednotenew/validator/DebCredNewAuditValidatorOp.java @@ -130,16 +130,20 @@ public class DebCredNewAuditValidatorOp extends AbstractValidator { } DynamicObject getaccamtusetype = getaccamtusetype(dataEntity); - QFilter qFilter1 = new QFilter("yem_contracttype", QCP.equals, getaccamtusetype.getString("yem_billtype.number"));//合同类型 - qFilter1.and(new QFilter("yem_accamtusetype", QCP.equals, getaccamtusetype.getString("yem_fundusetype"))); - qFilter1.and(new QFilter("yem_billbusstype.number", QCP.equals, getaccamtusetype.getString("yem_billbusstype.number"))); - qFilter1.and(new QFilter("enable", QCP.equals, "1")); - String selectfield1 = DynamicObjectUtil.getSelectfields("yem_bd_credittypeconfig", false); - String selectfields1 = DynamicObjectUtil.getEntrySelectfields(selectfield1, "yem_bd_credittypeconfig", "yem_credittypeentry", false); Map isoveragemap = new HashMap<>(); - DynamicObjectCollection data11 = QueryServiceHelper.query("yem_bd_credittypeconfig", - selectfields1, new QFilter[]{qFilter1}, null); - if (data11.size() > 0) { + DynamicObjectCollection data11 = null; + if (YEM.isNotEmpty(getaccamtusetype)) { + QFilter qFilter1 = new QFilter("yem_contracttype", QCP.equals, getaccamtusetype.getString("yem_billtype.number"));//合同类型 + qFilter1.and(new QFilter("yem_accamtusetype", QCP.equals, getaccamtusetype.getString("yem_fundusetype"))); + qFilter1.and(new QFilter("yem_billbusstype.number", QCP.equals, getaccamtusetype.getString("yem_billbusstype.number"))); + qFilter1.and(new QFilter("enable", QCP.equals, "1")); + String selectfield1 = DynamicObjectUtil.getSelectfields("yem_bd_credittypeconfig", false); + String selectfields1 = DynamicObjectUtil.getEntrySelectfields(selectfield1, "yem_bd_credittypeconfig", "yem_credittypeentry", false); + data11 = QueryServiceHelper.query("yem_bd_credittypeconfig", + selectfields1, new QFilter[]{qFilter1}, null); + } + + if (YEM.isNotEmpty(data11)) { for (int i = 0; i < data11.size(); i++) { DynamicObject object1 = data11.get(i); long aLong = object1.getLong("yem_credittypeentry.yem_credittype");