diff --git a/code/tmc/kdsz-zyf25-tmc-cfm/src/main/java/kdsz/zyf25/tmc/cfm/plugin/form/fi/PublicReimburseDefaultBillPlugin.java b/code/tmc/kdsz-zyf25-tmc-cfm/src/main/java/kdsz/zyf25/tmc/cfm/plugin/form/fi/PublicReimburseDefaultBillPlugin.java index 1ca38b1..0a0bcf5 100644 --- a/code/tmc/kdsz-zyf25-tmc-cfm/src/main/java/kdsz/zyf25/tmc/cfm/plugin/form/fi/PublicReimburseDefaultBillPlugin.java +++ b/code/tmc/kdsz-zyf25-tmc-cfm/src/main/java/kdsz/zyf25/tmc/cfm/plugin/form/fi/PublicReimburseDefaultBillPlugin.java @@ -17,6 +17,7 @@ import kd.sdk.plugin.Plugin; import kdsz.zyf25.tmc.cfm.common.AppConfig; import java.util.EventObject; +import java.util.HashMap; import java.util.HashSet; /** @@ -30,7 +31,8 @@ public class PublicReimburseDefaultBillPlugin extends AbstractBillPlugIn impleme super.afterCreateNewData(e); FormShowParameter showParameter = this.getView().getFormShowParameter(); String appId = showParameter.getAppId(); - if (AppConfig.KEY_TYPE_GYL.equals(appId)) { + HashMap appOriEntityMap = AppConfig.appOriEntityMap; + if (appOriEntityMap.containsKey(appId)) { this.getModel().setValue("kdsz_jxinvoicetype", AppConfig.KEY_TYPE_GYL); DynamicObject expense = BusinessDataServiceHelper.loadSingle("er_expenseitemedit", "id", new QFilter[]{new QFilter("number", QCP.equals, DEFAULT_EXPENSE_NUM)}); diff --git a/code/tmc/kdsz-zyf25-tmc-cfm/src/main/java/kdsz/zyf25/tmc/cfm/plugin/operate/PaymentBillDeleteLkOperationPlugin.java b/code/tmc/kdsz-zyf25-tmc-cfm/src/main/java/kdsz/zyf25/tmc/cfm/plugin/operate/PaymentBillDeleteLkOperationPlugin.java index bf82e2c..98ce004 100644 --- a/code/tmc/kdsz-zyf25-tmc-cfm/src/main/java/kdsz/zyf25/tmc/cfm/plugin/operate/PaymentBillDeleteLkOperationPlugin.java +++ b/code/tmc/kdsz-zyf25-tmc-cfm/src/main/java/kdsz/zyf25/tmc/cfm/plugin/operate/PaymentBillDeleteLkOperationPlugin.java @@ -83,6 +83,7 @@ public class PaymentBillDeleteLkOperationPlugin extends AbstractOperationService if (srcJXBillId.compareTo( jxId) == 0){ //获取计息关联付款分录 DynamicObjectCollection jxLkPayEntries = srcPayEntry.getDynamicObjectCollection("kdsz_paylinkentry"); + if (jxLkPayEntries == null)continue; Iterator iterator = jxLkPayEntries.iterator(); while (iterator.hasNext()){ DynamicObject next = iterator.next();