From 5d9fc400b0327167cc6c47439265e85599eeb05a Mon Sep 17 00:00:00 2001
From: zhenggm <zhenggm@jujiatech.com>
Date: Thu, 25 Aug 2022 18:50:20 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B5=E9=9D=A2+BillType=EF=BC=8C=E8=A1=A8?=
 =?UTF-8?q?=E5=AE=9A=E4=B9=89=E5=8A=A0buildBean?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/cc/smtweb/system/bpm/web/design/form/ModelFormHelper.java     | 1 +
 .../cc/smtweb/system/bpm/web/design/form/ModelFormLoadHandler.java     | 3 ++-
 .../core/src/main/java/cc/smtweb/framework/core/db/EntityDao.java      | 1 +
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/ModelFormHelper.java b/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/ModelFormHelper.java
index 4e0f3c6..c72a48a 100644
--- a/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/ModelFormHelper.java
+++ b/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/ModelFormHelper.java
@@ -517,6 +517,7 @@ public class ModelFormHelper {
     public static void buildFieldInfo(ModelTable table, ModelField field, SwMap col) {
         col.put("name", field.getName());
         col.put("dataType", field.getDataType());
+        col.put("fieldType", field.getFieldType());
         col.put("null", field.getNotNull());
         col.put("default", field.getDefaultValue());
         col.put("title", field.getTitle());
diff --git a/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/ModelFormLoadHandler.java b/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/ModelFormLoadHandler.java
index 14f03a6..204e0c4 100644
--- a/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/ModelFormLoadHandler.java
+++ b/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/ModelFormLoadHandler.java
@@ -12,6 +12,7 @@ import cc.smtweb.framework.core.util.SpringUtil;
 import cc.smtweb.system.bpm.spring.BpmConfigBean;
 import cc.smtweb.system.bpm.util.IdeaUtil;
 import cc.smtweb.system.bpm.web.design.db.ModelProjectCache;
+import cc.smtweb.system.bpm.web.sys.base.billType.BillTypeCache;
 import org.apache.commons.lang3.StringUtils;
 
 import java.util.ArrayList;
@@ -36,7 +37,7 @@ public class ModelFormLoadHandler extends DefaultLoadHandler<ModelForm> {
         long billType = bean.getBillType();
         if (billType > 0L) {
             SwMap opts = bean.getOpts();
-//            opts.put(ModelFormHelper.KEY_BILL_TYPE + SwConsts.TEXT_SUFFIX, BillTypeCache.);
+            opts.put(ModelFormHelper.KEY_BILL_TYPE + SwConsts.TEXT_SUFFIX, BillTypeCache.getInstance().getName(billType));
         }
 
         return bean;
diff --git a/smtweb-framework/core/src/main/java/cc/smtweb/framework/core/db/EntityDao.java b/smtweb-framework/core/src/main/java/cc/smtweb/framework/core/db/EntityDao.java
index bdadac7..6a518ef 100644
--- a/smtweb-framework/core/src/main/java/cc/smtweb/framework/core/db/EntityDao.java
+++ b/smtweb-framework/core/src/main/java/cc/smtweb/framework/core/db/EntityDao.java
@@ -359,6 +359,7 @@ public class EntityDao<T> extends AbstractEntityDao<T> {
      * 查询对象所有数据，返回列表
      */
     public List<T> query(String fields) {
+        if (StringUtils.isEmpty(fields) && columns.isEmpty()) return null;
         StringBuilder sb = new StringBuilder();
         handleSelect(sb, fields);