From e8a49b396dcfe881a3cd3ad53c1116ae84d4d5a8 Mon Sep 17 00:00:00 2001
From: zhenggm <zhenggm@jujiatech.com>
Date: Fri, 27 May 2022 18:54:26 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cc/smtweb/system/bpm/web/design/form/ModelFormSaveHandler.java | 7 ++++---
 .../system/bpm/web/design/table/ModelCatalogTreeHandler.java       | 3 +--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/ModelFormSaveHandler.java b/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/ModelFormSaveHandler.java
index 21c5c3d..2f1f818 100644
--- a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/ModelFormSaveHandler.java
+++ b/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/ModelFormSaveHandler.java
@@ -61,11 +61,12 @@ public class ModelFormSaveHandler extends DefaultSaveHandler<ModelForm> {
     public R saveModel() {
         long id = params.readLong("id");
         String data = params.readString("data");
-        ModelForm form = loadComp(id);
+        bean = loadComp(id);
         if (StringUtils.isEmpty(data)) {
             throw new SwException("没有待保存的数据！");
         }
-        form.setContent(ModelFormHelper.buildSaveModel(form));
+        bean.setContent(data);
+        bean.setContent(ModelFormHelper.buildSaveModel(bean));
         DbEngine.getInstance().doTrans(new AbsDbWorker() {
             @Override
             public void work() {
@@ -74,7 +75,7 @@ public class ModelFormSaveHandler extends DefaultSaveHandler<ModelForm> {
                 ModelTable table = ModelTableCache.getInstance().getByName(tableName);
                 ModelField field = table.findFieldByType(SwEnum.FieldType.UPDATE_USER.value);
                 if (field != null) bean.put(field.getName(), us.getUserId());
-                dao.updateEntity(form, "mf_content");
+                dao.updateEntity(bean, "mf_content");
             }
 
             @Override
diff --git a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/table/ModelCatalogTreeHandler.java b/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/table/ModelCatalogTreeHandler.java
index 651a839..5370088 100644
--- a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/table/ModelCatalogTreeHandler.java
+++ b/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/table/ModelCatalogTreeHandler.java
@@ -83,8 +83,7 @@ public class ModelCatalogTreeHandler extends AbstractTreeHandler<DefaultEntity>
 
     @Override
     protected List<DefaultEntity> getChildren(long id) {
-        List<ModelCatalog> list;
-        list = mcTreeHelper.getChildren(id, prj_id, (o1, o2) -> CommUtil.chineseCompare(o1.getName(), o2.getName()));
+        List<ModelCatalog> list = mcTreeHelper.getChildren(id, prj_id, (o1, o2) -> CommUtil.chineseCompare(o1.getName(), o2.getName()));
 
         List<DefaultEntity> listRet = new ArrayList<>(list);