diff --git a/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/view/ActionCreate.java b/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/view/ActionCreate.java index ea8918b864396bcb143e6bfe977788f3d8099f1c..045f16bc774fc2a86ac77fe43c2ebfe97f067eb2 100644 --- a/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/view/ActionCreate.java +++ b/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/view/ActionCreate.java @@ -35,12 +35,12 @@ class ActionCreate extends BaseAction { } emc.beginTransaction(View.class); View view = Wi.copier.copy(wi); - switch (StringUtils.trimToEmpty(view.getType())) { + switch (StringUtils.trimToEmpty(wi.getType())) { case View.TYPE_CMS: - view.setData(gson.toJson(gson.fromJson(view.getData(), CmsPlan.class))); + //view.setData(gson.toJson(gson.fromJson(view.getData(), CmsPlan.class))); break; case View.TYPE_PROCESSPLATFORM: - view.setData(gson.toJson(gson.fromJson(view.getData(), ProcessPlatformPlan.class))); + //view.setData(gson.toJson(gson.fromJson(view.getData(), ProcessPlatformPlan.class))); break; default: throw new ExceptionTypeValue(wi.getType()); @@ -75,4 +75,4 @@ class ActionCreate extends BaseAction { } -} \ No newline at end of file +} diff --git a/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/view/ActionEdit.java b/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/view/ActionEdit.java index 79c3a66d84404135df7e254f1eb59b64dc3fc150..1ed302984fcfe8fe1a4882973f42c05be6a6736d 100644 --- a/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/view/ActionEdit.java +++ b/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/view/ActionEdit.java @@ -37,13 +37,12 @@ class ActionEdit extends BaseAction { if (!business.editable(effectivePerson, query)) { throw new ExceptionQueryAccessDenied(effectivePerson.getDistinguishedName(), query.getName()); } - Wi.copier.copy(wi, view); - switch (StringUtils.trimToEmpty(view.getType())) { + switch (StringUtils.trimToEmpty(wi.getType())) { case View.TYPE_CMS: - view.setData(gson.toJson(gson.fromJson(view.getData(), CmsPlan.class))); + //view.setData(gson.toJson(gson.fromJson(view.getData(), CmsPlan.class))); break; case View.TYPE_PROCESSPLATFORM: - view.setData(gson.toJson(gson.fromJson(view.getData(), ProcessPlatformPlan.class))); + //view.setData(gson.toJson(gson.fromJson(view.getData(), ProcessPlatformPlan.class))); break; default: throw new ExceptionTypeValue(wi.getType()); @@ -77,4 +76,4 @@ class ActionEdit extends BaseAction { static WrapCopier copier = WrapCopierFactory.wi(Wi.class, View.class, null, JpaObject.FieldsUnmodify); } -} \ No newline at end of file +}