diff --git a/io.sc.platform.core.frontend/src/platform/components/grid/GridEditor.vue b/io.sc.platform.core.frontend/src/platform/components/grid/GridEditor.vue
index 7e83fcee..1f1c4ce5 100644
--- a/io.sc.platform.core.frontend/src/platform/components/grid/GridEditor.vue
+++ b/io.sc.platform.core.frontend/src/platform/components/grid/GridEditor.vue
@@ -54,9 +54,8 @@ const save = async () => {
   if (validate) {
     let dialogFormData = dialogFormRef.value.getData();
     const selected = props.grid.getSelectedRow();
-    const primaryKey = selected[props.grid.props.primaryKey];
-    if (formStatus === 'edit' && selected) {
-      dialogFormData[props.grid.props.primaryKey] = primaryKey;
+    if (formStatus === 'edit' && selected[props.grid.props.primaryKey]) {
+      dialogFormData[props.grid.props.primaryKey] = selected[props.grid.props.primaryKey];
     }
     let submitFlag = true;
     let closeDialog = true;
@@ -72,10 +71,10 @@ const save = async () => {
       if (formStatus === 'addTop') {
         dialogFormData[props.grid.props.foreignKey] = null;
       } else if (formStatus === 'addChild') {
-        dialogFormData[props.grid.props.foreignKey] = primaryKey;
-      } else if (formStatus === 'edit' && primaryKey) {
-        dialogFormData[props.grid.props.foreignKey] = primaryKey;
-      } else if (formStatus === 'clone' && primaryKey) {
+        dialogFormData[props.grid.props.foreignKey] = selected[props.grid.props.primaryKey];
+      } else if (formStatus === 'edit' && selected[props.grid.props.primaryKey]) {
+        dialogFormData[props.grid.props.foreignKey] = selected[props.grid.props.primaryKey];
+      } else if (formStatus === 'clone' && selected[props.grid.props.primaryKey]) {
         dialogFormData[props.grid.props.foreignKey] = selected[props.grid.props.foreignKey];
       }
       if (formStatus === 'edit') {