From 748620a4aa3a0660b192dbb4d076ba989b5d0d89 Mon Sep 17 00:00:00 2001 From: zengweihai Date: Sat, 15 Jun 2024 16:15:13 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=98=E6=AC=BE=E4=BA=8B=E9=A1=B9=E7=BA=A6?= =?UTF-8?q?=E6=9D=9F=E8=B4=B9=E7=94=A8=E9=A1=B9=E7=9B=AE=E7=A9=BA=E5=80=BC?= =?UTF-8?q?=E5=88=A4=E6=96=AD=E4=BF=AE=E5=A4=8D01?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CommonExpenseItemBillFormPlugin.java | 23 +++++++++++++------ 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/shkd-cosmic-debug/src/main/java/shkd/fi/er/plugin/formplugin/CommonExpenseItemBillFormPlugin.java b/shkd-cosmic-debug/src/main/java/shkd/fi/er/plugin/formplugin/CommonExpenseItemBillFormPlugin.java index 6f69243..0573496 100644 --- a/shkd-cosmic-debug/src/main/java/shkd/fi/er/plugin/formplugin/CommonExpenseItemBillFormPlugin.java +++ b/shkd-cosmic-debug/src/main/java/shkd/fi/er/plugin/formplugin/CommonExpenseItemBillFormPlugin.java @@ -52,11 +52,23 @@ public class CommonExpenseItemBillFormPlugin extends AbstractBillPlugIn implemen DynamicObject payment = null; if ("expenseitem".equals(name)){ if (paymentList.contains(entityId)){ - String payID = dataEntity.getDynamicObject("shkd_payment").getString("id"); - payment = BusinessDataServiceHelper.loadSingle(payID,"bos_assistantdata_detail"); + DynamicObject shkd_payment = dataEntity.getDynamicObject("shkd_payment"); + if (shkd_payment != null){ + String payID = dataEntity.getDynamicObject("shkd_payment").getString("id"); + payment = BusinessDataServiceHelper.loadSingle(payID,"bos_assistantdata_detail"); + }else { + beforeF7SelectEvent.setCancel(true); + this.getView().showTipNotification("请先选择付款事项"); + } }else if (paymentItemList.contains(entityId)){ - String payID = dataEntity.getDynamicObject("shkd_paymentitem").getString("id"); - payment = BusinessDataServiceHelper.loadSingle(payID,"bos_assistantdata_detail"); + DynamicObject shkd_paymentitem = dataEntity.getDynamicObject("shkd_paymentitem"); + if (shkd_paymentitem != null){ + String payID = dataEntity.getDynamicObject("shkd_paymentitem").getString("id"); + payment = BusinessDataServiceHelper.loadSingle(payID,"bos_assistantdata_detail"); + }else { + beforeF7SelectEvent.setCancel(true); + this.getView().showTipNotification("请先选择付款事项"); + } } if (payment != null){ String longPaymentNumber = payment.getString("longnumber"); @@ -88,9 +100,6 @@ public class CommonExpenseItemBillFormPlugin extends AbstractBillPlugIn implemen this.getView().showTipNotification("该付款事项未关联费用项目"); } } - }else { - beforeF7SelectEvent.setCancel(true); - this.getView().showTipNotification("请先选择付款事项"); } }