From 4bbc6e4f18248c02361f437989e34785c77e369f Mon Sep 17 00:00:00 2001 From: zhenggm Date: Mon, 29 Aug 2022 21:11:03 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E5=BC=95=E6=93=8E-listhandle?= =?UTF-8?q?r?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cc/smtweb/system/bpm/web/design/db/ModelCatalogTreeHandler.java | 1 + .../src/main/java/cc/smtweb/system/bpm/web/design/form/ModelForm.java | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/design/db/ModelCatalogTreeHandler.java b/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/design/db/ModelCatalogTreeHandler.java index e19af19..a045192 100644 --- a/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/design/db/ModelCatalogTreeHandler.java +++ b/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/design/db/ModelCatalogTreeHandler.java @@ -50,6 +50,7 @@ public class ModelCatalogTreeHandler extends AbstractTreeHandler exc_empty = params.readBool("exc_empty"); exc_depend = params.readBool("exc_depend"); only_bill = params.readBool("only_bill"); + if (only_bill) exc_empty = true; mcTreeHelper = (ModelCatalogTreeHelper) TreeHelper.getTreeHelper(ModelCatalog.ENTITY_NAME); } diff --git a/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/ModelForm.java b/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/ModelForm.java index 509750a..2794a63 100644 --- a/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/ModelForm.java +++ b/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/ModelForm.java @@ -230,6 +230,7 @@ public class ModelForm extends DefaultEntity { //返回单据类型id public long getBillType() { - return getOpts().readLong(ModelFormHelper.KEY_BILL_TYPE); + SwMap opts = getOpts(); + return opts != null ? opts.readLong(ModelFormHelper.KEY_BILL_TYPE) : 0L; } }