merge master level1

importer/odbcimporter.go

@@ -154,6 +154,17 @@ func (odbci *ODBCImporter) masterlevel1data(classaliasname string, suid string,
 		if level1data == nil {
 			// 先插入 master
 			masterdatas.Set(suid, data)
+			level1data = map[string]any{}
+			for k, v := range data {
+				if k == "id" {
+					oid, _, e := graph.GetNodeId("level1", data)
+					if e != nil {
+						return e
+					}
+					v = oid
+				}
+				level1data[k] = v
+			}
 		} else {
 			// 后插入 master
 			level1datas.Remove(suid)
@@ -164,11 +175,11 @@ func (odbci *ODBCImporter) masterlevel1data(classaliasname string, suid string,
 					level1data[k] = v
 				}
 			}
-			// 重新插入完整的 level1
-			e := odbci.insertData("level1", level1data)
-			if e != nil {
-				return e
-			}
+		}
+		// 重新插入完整的 level1
+		e := odbci.insertData("level1", level1data)
+		if e != nil {
+			return e
 		}
 	case "level1":
 		masterdata := masterdatas.GetIFPresent(suid)