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("请先选择付款事项"); } }