Merge pull request #2591 from wusendong/solve_3.2

移除升级到3.2.x时遗留的脏数据

Former-commit-id: c6339a1

src/scene_server/admin_server/upgrader/x18.10.30.01/association.go

@@ -167,6 +167,8 @@ func reconcilAsstData(ctx context.Context, db dal.RDB, conf *upgrader.Config) er
 
 			asst.OnDelete = metadata.NoAction
 			asst.IsPre = pfalse()
+
+			blog.InfoJSON("obj: %s, att: %s to asst %s", asst.ObjectID, asst.ObjectAttID, asst)
 		}
 		_, _, err = upgrader.Upsert(ctx, db, common.BKTableNameObjAsst, asst, "id", []string{"bk_obj_id", "bk_asst_obj_id"}, []string{"id"})
 		if err != nil {
@@ -219,6 +221,12 @@ func reconcilAsstData(ctx context.Context, db dal.RDB, conf *upgrader.Config) er
 			return err
 		}
 	}
+
+	delCond := condition.CreateCondition()
+	delCond.Field(common.AssociationKindIDField).Eq(nil)
+	if err = db.Table(common.BKTableNameObjAsst).Delete(ctx, delCond.ToMapStr()); err != nil {
+		return err
+	}
 	return nil
 }