From 5b6d4402707a00bf66bdd76b9599471f500f34d7 Mon Sep 17 00:00:00 2001 From: ljw Date: Wed, 11 Dec 2024 13:59:29 +0800 Subject: [PATCH] =?UTF-8?q?fix:=201.=E4=B8=8B=E5=8D=95=E5=AE=A1=E6=89=B9?= =?UTF-8?q?=E6=8A=A5=E9=94=99=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wm/im/debcrednotenew/utils/DebCredUtils.java | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/src/main/java/com/yem/wm/im/debcrednotenew/utils/DebCredUtils.java b/src/main/java/com/yem/wm/im/debcrednotenew/utils/DebCredUtils.java index 3881e1ab..a7595f29 100644 --- a/src/main/java/com/yem/wm/im/debcrednotenew/utils/DebCredUtils.java +++ b/src/main/java/com/yem/wm/im/debcrednotenew/utils/DebCredUtils.java @@ -3,19 +3,12 @@ package com.yem.wm.im.debcrednotenew.utils; import com.yem.or.utils.OrderUtils; import com.yem.wm.utils.DynamicObjectUtil; import com.yem.wm.utils.YEM; -import kd.bos.context.RequestContext; -import kd.bos.dataentity.OperateOption; import kd.bos.dataentity.entity.DynamicObject; import kd.bos.dataentity.entity.DynamicObjectCollection; -import kd.bos.entity.operate.result.IOperateInfo; -import kd.bos.entity.operate.result.OperationResult; -import kd.bos.exception.KDBizException; import kd.bos.orm.query.QCP; import kd.bos.orm.query.QFilter; import kd.bos.servicehelper.BusinessDataServiceHelper; import kd.bos.servicehelper.QueryServiceHelper; -import kd.bos.servicehelper.basedata.BaseDataServiceHelper; -import kd.bos.servicehelper.operation.OperationServiceHelper; import kd.bos.servicehelper.operation.SaveServiceHelper; import java.math.BigDecimal; @@ -737,14 +730,16 @@ public class DebCredUtils { DynamicObject yem_bd_products = dataEntitie.getDynamicObject("yem_bd_products"); QFilter qFilter = new QFilter("billstatus", QCP.equals, "C");// qFilter.and(new QFilter("org.id", QCP.equals, org.getLong("id"))); - qFilter.and(new QFilter("yem_customer.id", QCP.equals, yem_groupcustomers.getLong("id"))); + if (yem_groupcustomers != null) { + qFilter.and(new QFilter("yem_customer.id", QCP.equals, yem_groupcustomers.getLong("id"))); + } qFilter.and(new QFilter("yem_bd_products.id", QCP.equals, yem_bd_products.getLong("id"))); qFilter.and(new QFilter("yem_credittype.id", QCP.equals, yem_debcredtype.getLong("id"))); qFilter.and(new QFilter("yem_debcredtype", QCP.equals, debcredtype)); String selectfield = DynamicObjectUtil.getSelectfields("yem_debcrednote", false); String selectfields = DynamicObjectUtil.getEntrySelectfields(selectfield, "yem_debcrednote", "yem_creditnotedes", false); DynamicObjectCollection data = QueryServiceHelper.query("yem_debcrednote", "id," + selectfields, new QFilter[]{qFilter}, "billno DESC"); - if (data.size() > 0) { + if (!data.isEmpty()) { object = BusinessDataServiceHelper.loadSingle(data.get(0).getString("id"), "yem_debcrednote"); } return object;