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 { 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 { 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 @Override protected List getChildren(long id) { - List list; - list = mcTreeHelper.getChildren(id, prj_id, (o1, o2) -> CommUtil.chineseCompare(o1.getName(), o2.getName())); + List list = mcTreeHelper.getChildren(id, prj_id, (o1, o2) -> CommUtil.chineseCompare(o1.getName(), o2.getName())); List listRet = new ArrayList<>(list);