From 50485a70da5ca30e1db6cedf475c94cfa4f42f9c Mon Sep 17 00:00:00 2001
From: zhenggm <zhenggm@jujiatech.com>
Date: Wed, 1 Jun 2022 10:51:24 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E8=AE=BE=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/cc/smtweb/framework/core/db/cache/ModelTableCache.java | 5 +++++
 .../cc/smtweb/system/bpm/web/design/form/define/PageDataset.java     | 1 +
 .../cc/smtweb/system/bpm/web/design/form/define/PageDatasets.java    | 2 ++
 3 files changed, 8 insertions(+)

diff --git a/smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/db/cache/ModelTableCache.java b/smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/db/cache/ModelTableCache.java
index cb4f9e1..457c8c1 100644
--- a/smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/db/cache/ModelTableCache.java
+++ b/smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/db/cache/ModelTableCache.java
@@ -104,4 +104,9 @@ public class ModelTableCache extends AbstractCache<ModelTable> {
         list.sort(comparator);
         return list;
     }
+
+    public final String getTableName(long id) {
+        ModelTable bean = get(id);
+        return bean == null ? String.valueOf(id) : bean.getTitle();
+    }
 }
diff --git a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/define/PageDataset.java b/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/define/PageDataset.java
index ae5674b..54a965d 100644
--- a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/define/PageDataset.java
+++ b/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/define/PageDataset.java
@@ -26,6 +26,7 @@ public class PageDataset {
     public String type;
     //主表
     public long masterTable;
+    public String masterTable_text;
     //id字段 对应field的name
     public String idField;
     //list的自定义sql，仅列表支持，select fields from tables [condition] group by xxx order by xxx
diff --git a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/define/PageDatasets.java b/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/define/PageDatasets.java
index 4c24306..b7f51f7 100644
--- a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/define/PageDatasets.java
+++ b/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/define/PageDatasets.java
@@ -1,5 +1,6 @@
 package cc.smtweb.system.bpm.web.design.form.define;
 
+import cc.smtweb.framework.core.db.cache.ModelTableCache;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.sun.istack.internal.NotNull;
 
@@ -28,6 +29,7 @@ public class PageDatasets {
             this.list.add(ds);
             mapId.put(ds.id, ds);
             mapName.put(ds.name, ds);
+            ds.masterTable_text = ModelTableCache.getInstance().getTableName(ds.masterTable);
             ds.resetFields();
         }
     }