fix: remove legacy knowledge card tables and compatibility code

2026-08-20 21:58:04 +08:00
parent ebaf9b0b05
commit 6185e6cd49
36 changed files with 545 additions and 546 deletions
--- a/internal/run/detail.go
+++ b/internal/run/detail.go
@@ -24,7 +24,6 @@ type DetailEvent struct {
 	NodeType    string           `json:"node_type"`
 	NodeContent string           `json:"node_content"`
 	NodeConfig  datatypes.JSON   `json:"-"`
-	Knowledge   *KnowledgeView   `json:"knowledge,omitempty" gorm:"-"`
 	Outputs     []KnowledgeGroup `json:"outputs,omitempty" gorm:"-"`
 }

@@ -48,11 +47,10 @@ func (h *Handler) Detail(c *gin.Context) {
 		return
 	}
 	events := make([]DetailEvent, 0)
-	if err := h.db.Table("sop_run_events e").Select("e.*, n.title AS node_title, n.type AS node_type, n.content AS node_content, n.config AS node_config").Joins("LEFT JOIN sop_nodes n ON n.sop_version_id = ? AND n.node_key = e.node_key", header.SOPVersionID).Where("e.run_id = ? AND e.tenant_id = ?", id, principal.TenantID).Order("e.created_at, e.id").Scan(&events).Error; err != nil {
+	if err := h.db.Table("sop_run_events e").Select("e.*, n.title AS node_title, n.type AS node_type, n.content AS node_content, n.config AS node_config").Joins("LEFT JOIN sop_nodes n ON n.sop_id = ? AND n.node_key = e.node_key", header.SOPID).Where("e.run_id = ? AND e.tenant_id = ?", id, principal.TenantID).Order("e.created_at, e.id").Scan(&events).Error; err != nil {
 		response.Error(c, http.StatusInternalServerError, "QUERY_FAILED", "查询执行事件失败")
 		return
 	}
-	knowledgeCache := map[string]*KnowledgeView{}
 	answers := map[string]interface{}{}
 	_ = json.Unmarshal(header.Answers, &answers)
 	derived := map[string]interface{}{}
@@ -65,32 +63,21 @@ func (h *Handler) Detail(c *gin.Context) {
 		if events[i].NodeType != "knowledge" {
 			continue
 		}
-		cacheKey := string(events[i].NodeConfig)
-		if cached, ok := knowledgeCache[cacheKey]; ok {
-			events[i].Knowledge = cached
-			continue
-		}
 		var config knowledgeNodeConfig
 		_ = json.Unmarshal(events[i].NodeConfig, &config)
-		if config.KnowledgeSelector != nil {
-			var node model.SOPNode
-			if err := h.db.Where("sop_version_id = ? AND node_key = ?", header.SOPVersionID, events[i].NodeKey).First(&node).Error; err == nil {
-				outputs, loadErr := loadKnowledgeOutputs(h.db, node, principal.TenantID, context, *config.KnowledgeSelector)
-				if loadErr != nil {
-					response.Error(c, http.StatusInternalServerError, "KNOWLEDGE_NOT_FOUND", "执行记录知识快照不可用")
-					return
-				}
-				events[i].Outputs = outputs
-			}
+		if config.KnowledgeSelector == nil {
 			continue
 		}
-		knowledge, err := loadKnowledgeView(h.db, model.SOPNode{Type: events[i].NodeType, Config: events[i].NodeConfig}, principal.TenantID, answers)
-		if err != nil {
-			response.Error(c, http.StatusInternalServerError, "KNOWLEDGE_NOT_FOUND", "执行记录关联的历史知识内容不存在")
+		var node model.SOPNode
+		if err := h.db.Where("sop_id = ? AND node_key = ?", header.SOPID, events[i].NodeKey).First(&node).Error; err != nil {
+			continue
+		}
+		outputs, loadErr := loadKnowledgeOutputs(h.db, node, principal.TenantID, context, *config.KnowledgeSelector)
+		if loadErr != nil {
+			response.Error(c, http.StatusInternalServerError, "KNOWLEDGE_NOT_FOUND", "执行记录知识快照不可用")
 			return
 		}
-		events[i].Knowledge = &knowledge
-		knowledgeCache[cacheKey] = &knowledge
+		events[i].Outputs = outputs
 	}
 	feedback := make([]DetailFeedback, 0)
 	if err := h.db.Table("sop_feedback f").Select("f.*, u.display_name AS user_name").Joins("JOIN users u ON u.id = f.user_id").Where("f.run_id = ? AND f.tenant_id = ?", id, principal.TenantID).Order("f.created_at").Scan(&feedback).Error; err != nil {
--- a/internal/run/handler.go
+++ b/internal/run/handler.go
@@ -51,7 +51,7 @@ func (h *Handler) AvailableSOPs(c *gin.Context) {
 		ScenarioName string `json:"scenario_name"`
 	}
 	items := make([]item, 0)
-	query := h.db.Table("sops s").Select("s.id, s.name, s.description, s.scenario_id, sc.name AS scenario_name").Joins("JOIN scenarios sc ON sc.id = s.scenario_id").Joins("JOIN sop_versions sv ON sv.sop_id = s.id AND sv.status = ?", "published")
+	query := h.db.Table("sops s").Select("s.id, s.name, s.description, s.scenario_id, sc.name AS scenario_name").Joins("JOIN scenarios sc ON sc.id = s.scenario_id")
 	query = access.ScopeScenarios(query, p, "sc")
 	err := query.Where("s.tenant_id = ? AND s.status = ?", p.TenantID, "published").Order("s.updated_at DESC").Scan(&items).Error
 	if err != nil {
@@ -89,8 +89,8 @@ func (h *Handler) Start(c *gin.Context) {
 			return
 		}
 	}
-	var version model.SOPVersion
-	if err := h.db.Where("sop_id = ? AND tenant_id = ? AND status = ?", input.SOPID, p.TenantID, "published").Order("version DESC").First(&version).Error; err != nil {
+	var sop model.SOP
+	if err := h.db.Where("id = ? AND tenant_id = ? AND status = ?", input.SOPID, p.TenantID, "published").First(&sop).Error; err != nil {
 		response.Error(c, http.StatusNotFound, "NOT_FOUND", "没有可执行的 SOP")
 		return
 	}
@@ -99,11 +99,7 @@ func (h *Handler) Start(c *gin.Context) {
 		response.Error(c, http.StatusInternalServerError, "QUERY_FAILED", "查询场景字段失败")
 		return
 	}
-	var sopItem model.SOP
-	if err := h.db.Where("id = ? AND tenant_id = ?", input.SOPID, p.TenantID).First(&sopItem).Error; err != nil {
-		response.Error(c, http.StatusNotFound, "NOT_FOUND", "SOP 不存在")
-		return
-	}
+	var sopItem = sop
 	if input.Input == nil {
 		input.Input = map[string]interface{}{}
 	}
@@ -138,7 +134,7 @@ func (h *Handler) Start(c *gin.Context) {
 	if externalRef == "" {
 		externalRef = "run-" + uuid.NewString()
 	}
-	run := model.SOPRun{TenantID: p.TenantID, SOPID: input.SOPID, SOPVersionID: version.ID, OperatorID: p.UserID, ExternalRef: externalRef, CurrentNodeKey: version.StartNodeKey, Status: "running", Answers: datatypes.JSON(initialAnswers), Input: datatypes.JSON(initialAnswers), Derived: datatypes.JSON(derivedRaw), Outputs: datatypes.JSON([]byte(`[]`)), KnowledgeSnapshot: datatypes.JSON(knowledgeRaw), Result: "", StartedAt: time.Now()}
+	run := model.SOPRun{TenantID: p.TenantID, SOPID: input.SOPID, OperatorID: p.UserID, ExternalRef: externalRef, CurrentNodeKey: sop.StartNodeKey, Status: "running", Answers: datatypes.JSON(initialAnswers), Input: datatypes.JSON(initialAnswers), Derived: datatypes.JSON(derivedRaw), Outputs: datatypes.JSON([]byte(`[]`)), KnowledgeSnapshot: datatypes.JSON(knowledgeRaw), Result: "", StartedAt: time.Now()}
 	err = h.db.Transaction(func(tx *gorm.DB) error {
 		if err := tx.Create(&run).Error; err != nil {
 			return err
@@ -208,7 +204,7 @@ func (h *Handler) List(c *gin.Context) {
 	items := make([]listItem, 0)
 	// The run payload contains several large JSON snapshots. The history list only
 	// needs scalar metadata; excluding blobs keeps MySQL's sort buffer bounded.
-	listColumns := "r.id, r.created_at, r.updated_at, r.tenant_id, r.sop_id, r.sop_version_id, r.operator_id, r.external_ref, r.current_node_key, r.status, r.result, r.started_at, r.completed_at, s.name AS sop_name, sc.name AS scenario_name, u.display_name AS operator_name"
+	listColumns := "r.id, r.created_at, r.updated_at, r.tenant_id, r.sop_id, r.operator_id, r.external_ref, r.current_node_key, r.status, r.result, r.started_at, r.completed_at, s.name AS sop_name, sc.name AS scenario_name, u.display_name AS operator_name"
 	if err := query.Select(listColumns).Order("r.created_at DESC, r.id DESC").Offset((page - 1) * pageSize).Limit(pageSize).Scan(&items).Error; err != nil {
 		response.Error(c, http.StatusInternalServerError, "QUERY_FAILED", "查询执行记录失败")
 		return
@@ -268,7 +264,7 @@ func (h *Handler) Answer(c *gin.Context) {
 			return errors.New("当前步骤已经变化，请刷新后重试")
 		}
 		var currentNode model.SOPNode
-		if err := tx.Where("sop_version_id = ? AND node_key = ? AND tenant_id = ?", updated.SOPVersionID, updated.CurrentNodeKey, p.TenantID).First(&currentNode).Error; err != nil {
+		if err := tx.Where("sop_id = ? AND node_key = ? AND tenant_id = ?", updated.SOPID, updated.CurrentNodeKey, p.TenantID).First(&currentNode).Error; err != nil {
 			return err
 		}
 		fields := make([]model.ScenarioField, 0)
@@ -289,7 +285,7 @@ func (h *Handler) Answer(c *gin.Context) {
 			return err
 		}
 		var edges []model.SOPEdge
-		if err := tx.Where("sop_version_id = ? AND source_node_key = ?", updated.SOPVersionID, updated.CurrentNodeKey).Order("priority, id").Find(&edges).Error; err != nil {
+		if err := tx.Where("sop_id = ? AND source_node_key = ? AND tenant_id = ?", updated.SOPID, updated.CurrentNodeKey, p.TenantID).Order("priority, id").Find(&edges).Error; err != nil {
 			return err
 		}
 		sortEdges(edges)
@@ -313,7 +309,7 @@ func (h *Handler) Answer(c *gin.Context) {
 			return err
 		}
 		var next model.SOPNode
-		if err := tx.Where("sop_version_id = ? AND node_key = ?", updated.SOPVersionID, nextKey).First(&next).Error; err != nil {
+		if err := tx.Where("sop_id = ? AND node_key = ? AND tenant_id = ?", updated.SOPID, nextKey, p.TenantID).First(&next).Error; err != nil {
 			return err
 		}
 		updates := map[string]interface{}{"current_node_key": nextKey, "answers": datatypes.JSON(answerBytes)}
@@ -492,7 +488,7 @@ func (h *Handler) Feedback(c *gin.Context) {

 func (h *Handler) respondRun(c *gin.Context, item model.SOPRun) {
 	var node model.SOPNode
-	if err := h.db.Where("sop_version_id = ? AND node_key = ? AND tenant_id = ?", item.SOPVersionID, item.CurrentNodeKey, item.TenantID).First(&node).Error; err != nil {
+	if err := h.db.Where("sop_id = ? AND node_key = ? AND tenant_id = ?", item.SOPID, item.CurrentNodeKey, item.TenantID).First(&node).Error; err != nil {
 		response.Error(c, http.StatusInternalServerError, "NODE_NOT_FOUND", "当前流程节点不存在")
 		return
 	}
--- a/internal/run/knowledge.go
+++ b/internal/run/knowledge.go
@@ -7,30 +7,12 @@ import (
 	"sort"
 	"strings"

-	knowledgecontent "git.iwork-ai.com/xdc/iqudo-top1/internal/knowledge"
 	"git.iwork-ai.com/xdc/iqudo-top1/internal/model"
 	"gorm.io/gorm"
 )

 var knowledgePlaceholderPattern = regexp.MustCompile(`\{\{\s*(?:input|derived|form)\.([A-Za-z][A-Za-z0-9_]*)\s*\}\}`)

-type KnowledgeView struct {
-	CardID        uint64          `json:"card_id"`
-	CardVersionID uint64          `json:"card_version_id"`
-	Version       int             `json:"version"`
-	Title         string          `json:"title"`
-	StandardCopy  string          `json:"standard_copy"`
-	ForbiddenCopy string          `json:"forbidden_copy"`
-	RiskNote      string          `json:"risk_note"`
-	Copies        []KnowledgeCopy `json:"copies"`
-}
-
-type KnowledgeCopy struct {
-	ID      string `json:"id"`
-	Title   string `json:"title"`
-	Content string `json:"content"`
-}
-
 type NodeView struct {
 	NodeKey      string                   `json:"node_key"`
 	Type         string                   `json:"type"`
@@ -39,7 +21,6 @@ type NodeView struct {
 	Config       json.RawMessage          `json:"config,omitempty"`
 	Fields       []PublicFieldView        `json:"fields,omitempty"`
 	Presentation *NodePresentation        `json:"presentation,omitempty"`
-	Knowledge    *KnowledgeView           `json:"knowledge,omitempty"`
 	Outputs      []KnowledgeGroup         `json:"outputs"`
 	Collection   *KnowledgeCollectionView `json:"collection,omitempty"`
 }
@@ -70,10 +51,8 @@ type KnowledgeItemView struct {
 }

 type knowledgeNodeConfig struct {
-	KnowledgeCardID        uint64                     `json:"knowledge_card_id"`
-	KnowledgeCardVersionID uint64                     `json:"knowledge_card_version_id"`
-	KnowledgeSelector      *knowledgeSelector         `json:"knowledge_selector"`
-	KnowledgeCollection    *knowledgeCollectionConfig `json:"knowledge_collection"`
+	KnowledgeSelector   *knowledgeSelector         `json:"knowledge_selector"`
+	KnowledgeCollection *knowledgeCollectionConfig `json:"knowledge_collection"`
 }

 type knowledgeCollectionConfig struct {
@@ -168,11 +147,6 @@ func (h *Handler) nodeView(db *gorm.DB, node model.SOPNode, tenantID uint64, ans
 		}
 		return view, nil
 	}
-	knowledge, err := loadKnowledgeView(db, node, tenantID, answers)
-	if err != nil {
-		return view, err
-	}
-	view.Knowledge = &knowledge
 	return view, nil
 }

@@ -272,7 +246,7 @@ func loadPublicFieldsByKeys(db *gorm.DB, node model.SOPNode, tenantID uint64, ke
 		return []PublicFieldView{}, nil
 	}
 	var fields []model.ScenarioField
-	if err := db.Table("scenario_fields sf").Select("sf.*").Joins("JOIN sops s ON s.scenario_id = sf.scenario_id").Joins("JOIN sop_versions sv ON sv.sop_id = s.id").Where("sv.id = ? AND sf.tenant_id = ? AND sf.field_key IN ?", node.SOPVersionID, tenantID, keys).Find(&fields).Error; err != nil {
+	if err := db.Table("scenario_fields sf").Select("sf.*").Joins("JOIN sops s ON s.scenario_id = sf.scenario_id").Where("s.id = ? AND sf.tenant_id = ? AND sf.field_key IN ?", node.SOPID, tenantID, keys).Find(&fields).Error; err != nil {
 		return nil, err
 	}
 	byKey := map[string]model.ScenarioField{}
@@ -310,7 +284,7 @@ func loadPublicNodeFields(db *gorm.DB, node model.SOPNode, tenantID uint64) ([]P
 		return nil, nil
 	}
 	var fields []model.ScenarioField
-	if err := db.Table("scenario_fields sf").Select("sf.*").Joins("JOIN sops s ON s.scenario_id = sf.scenario_id").Joins("JOIN sop_versions sv ON sv.sop_id = s.id").Where("sv.id = ? AND sf.tenant_id = ? AND sf.field_key IN ?", node.SOPVersionID, tenantID, keys).Find(&fields).Error; err != nil {
+	if err := db.Table("scenario_fields sf").Select("sf.*").Joins("JOIN sops s ON s.scenario_id = sf.scenario_id").Where("s.id = ? AND sf.tenant_id = ? AND sf.field_key IN ?", node.SOPID, tenantID, keys).Find(&fields).Error; err != nil {
 		return nil, err
 	}
 	byKey := make(map[string]model.ScenarioField, len(fields))
@@ -330,7 +304,7 @@ func loadPublicNodeFields(db *gorm.DB, node model.SOPNode, tenantID uint64) ([]P

 func loadKnowledgeOutputs(db *gorm.DB, node model.SOPNode, tenantID uint64, context map[string]interface{}, selector knowledgeSelector) ([]KnowledgeGroup, error) {
 	var sopRow struct{ ScenarioID uint64 }
-	if err := db.Table("sop_nodes n").Select("s.scenario_id").Joins("JOIN sop_versions sv ON sv.id = n.sop_version_id").Joins("JOIN sops s ON s.id = sv.sop_id").Where("n.id = ? AND n.tenant_id = ?", node.ID, tenantID).Scan(&sopRow).Error; err != nil {
+	if err := db.Table("sop_nodes n").Select("s.scenario_id").Joins("JOIN sops s ON s.id = n.sop_id").Where("n.id = ? AND n.tenant_id = ?", node.ID, tenantID).Scan(&sopRow).Error; err != nil {
 		return nil, err
 	}
 	return loadKnowledgeOutputsForScenario(db, sopRow.ScenarioID, tenantID, context, selector)
@@ -534,43 +508,3 @@ func stringSlice(value interface{}) []string {
 	}
 	return result
 }
-
-func loadKnowledgeView(db *gorm.DB, node model.SOPNode, tenantID uint64, answers map[string]interface{}) (KnowledgeView, error) {
-	var config knowledgeNodeConfig
-	if err := json.Unmarshal(node.Config, &config); err != nil {
-		return KnowledgeView{}, err
-	}
-	type row struct {
-		model.KnowledgeCardVersion
-		Title string `gorm:"column:title"`
-	}
-	var version row
-	query := db.Table("knowledge_card_versions kv").Select("kv.*, kc.title").
-		Joins("JOIN knowledge_cards kc ON kc.id = kv.knowledge_card_id").
-		Where("kv.tenant_id = ? AND kc.tenant_id = ? AND kv.knowledge_card_id = ?", tenantID, tenantID, config.KnowledgeCardID)
-	if config.KnowledgeCardVersionID != 0 {
-		query = query.Where("kv.id = ?", config.KnowledgeCardVersionID)
-	} else {
-		query = query.Where("kv.status = ?", "published").Order("kv.version DESC")
-	}
-	if err := query.First(&version).Error; err != nil {
-		return KnowledgeView{}, err
-	}
-	content, err := knowledgecontent.ParseContent(version.Content)
-	if err != nil {
-		return KnowledgeView{}, err
-	}
-	rendered := knowledgecontent.Render(content, answers)
-	copies := make([]KnowledgeCopy, 0, len(rendered))
-	for _, copy := range rendered {
-		copies = append(copies, KnowledgeCopy{ID: copy.ID, Title: copy.Title, Content: copy.Content})
-	}
-	standardCopy := ""
-	if len(copies) > 0 {
-		standardCopy = copies[0].Content
-	}
-	return KnowledgeView{
-		CardID: version.KnowledgeCardID, CardVersionID: version.ID, Version: version.Version, Title: version.Title,
-		StandardCopy: standardCopy, ForbiddenCopy: content.ForbiddenCopy, RiskNote: content.RiskNote, Copies: copies,
-	}, nil
-}
--- a/internal/run/node_view_test.go
+++ b/internal/run/node_view_test.go
@@ -14,7 +14,7 @@ func TestNodeViewDoesNotExposeInternalSnapshotFields(t *testing.T) {
 	if err := json.Unmarshal(raw, &value); err != nil {
 		t.Fatal(err)
 	}
-	for _, key := range []string{"id", "tenant_id", "sop_version_id", "config", "position_x", "position_y"} {
+	for _, key := range []string{"id", "tenant_id", "sop_id", "sop_version_id", "config", "position_x", "position_y"} {
 		if _, exists := value[key]; exists {
 			t.Fatalf("public node contains internal field %s: %s", key, raw)
 		}
--- a/internal/run/public.go
+++ b/internal/run/public.go
@@ -65,11 +65,6 @@ func (h *Handler) PublicStart(c *gin.Context) {
 			return
 		}
 	}
-	var version model.SOPVersion
-	if err := h.db.Where("sop_id = ? AND tenant_id = ? AND status = ?", sop.ID, scenario.TenantID, "published").Order("version DESC").First(&version).Error; err != nil {
-		response.Error(c, http.StatusNotFound, "SOP_NOT_FOUND", "场景没有可执行的 SOP")
-		return
-	}
 	fields := make([]model.ScenarioField, 0)
 	if err := h.db.Where("scenario_id = ? AND tenant_id = ?", scenario.ID, scenario.TenantID).Order("sort_order, id").Find(&fields).Error; err != nil {
 		response.Error(c, http.StatusInternalServerError, "QUERY_FAILED", "查询场景契约失败")
@@ -96,7 +91,7 @@ func (h *Handler) PublicStart(c *gin.Context) {
 	if externalRef == "" {
 		externalRef = "run-" + uuid.NewString()
 	}
-	run := model.SOPRun{TenantID: scenario.TenantID, SOPID: sop.ID, SOPVersionID: version.ID, OperatorID: scenario.CreatedBy, ExternalRef: externalRef, CurrentNodeKey: version.StartNodeKey, Status: "running", Answers: datatypes.JSON(raw), Input: datatypes.JSON(raw), Derived: datatypes.JSON(derivedRaw), Outputs: datatypes.JSON([]byte(`[]`)), KnowledgeSnapshot: datatypes.JSON(knowledgeRaw), StartedAt: time.Now()}
+	run := model.SOPRun{TenantID: scenario.TenantID, SOPID: sop.ID, OperatorID: scenario.CreatedBy, ExternalRef: externalRef, CurrentNodeKey: sop.StartNodeKey, Status: "running", Answers: datatypes.JSON(raw), Input: datatypes.JSON(raw), Derived: datatypes.JSON(derivedRaw), Outputs: datatypes.JSON([]byte(`[]`)), KnowledgeSnapshot: datatypes.JSON(knowledgeRaw), StartedAt: time.Now()}
 	token := uuid.NewString() + uuid.NewString()
 	err = h.db.Transaction(func(tx *gorm.DB) error {
 		if err := tx.Create(&run).Error; err != nil {
@@ -162,7 +157,7 @@ func (h *Handler) PublicSubmit(c *gin.Context) {
 			return errPublicNodeChanged
 		}
 		var node model.SOPNode
-		if err := tx.Where("sop_version_id = ? AND node_key = ? AND tenant_id = ?", run.SOPVersionID, run.CurrentNodeKey, run.TenantID).First(&node).Error; err != nil {
+		if err := tx.Where("sop_id = ? AND node_key = ? AND tenant_id = ?", run.SOPID, run.CurrentNodeKey, run.TenantID).First(&node).Error; err != nil {
 			return err
 		}
 		fields := make([]model.ScenarioField, 0)
@@ -212,7 +207,7 @@ func (h *Handler) PublicNext(c *gin.Context) {
 			return errPublicRunCompleted
 		}
 		var node model.SOPNode
-		if err := tx.Where("sop_version_id = ? AND node_key = ? AND tenant_id = ?", run.SOPVersionID, run.CurrentNodeKey, run.TenantID).First(&node).Error; err != nil {
+		if err := tx.Where("sop_id = ? AND node_key = ? AND tenant_id = ?", run.SOPID, run.CurrentNodeKey, run.TenantID).First(&node).Error; err != nil {
 			return err
 		}
 		if node.Type == "question" || node.Type == "choice" || node.Type == "form" {
@@ -305,11 +300,11 @@ func (h *Handler) PublicReset(c *gin.Context) {
 		if err := lockPublicRun(tx, session, &run); err != nil {
 			return err
 		}
-		var version model.SOPVersion
-		if err := tx.Where("id = ? AND tenant_id = ?", run.SOPVersionID, run.TenantID).First(&version).Error; err != nil {
+		var sop model.SOP
+		if err := tx.Where("id = ? AND tenant_id = ?", run.SOPID, run.TenantID).First(&sop).Error; err != nil {
 			return err
 		}
-		run.CurrentNodeKey, run.Status, run.Result, run.FinalResult, run.CompletedAt, run.Answers = version.StartNodeKey, "running", "", nil, nil, run.Input
+		run.CurrentNodeKey, run.Status, run.Result, run.FinalResult, run.CompletedAt, run.Answers = sop.StartNodeKey, "running", "", nil, nil, run.Input
 		if err := tx.Model(&run).Updates(map[string]interface{}{"current_node_key": run.CurrentNodeKey, "status": run.Status, "result": run.Result, "final_result": nil, "completed_at": nil, "answers": run.Input, "outputs": datatypes.JSON([]byte(`[]`))}).Error; err != nil {
 			return err
 		}
@@ -327,7 +322,7 @@ func (h *Handler) PublicReset(c *gin.Context) {

 func advancePublicRun(tx *gorm.DB, run *model.SOPRun) error {
 	var edges []model.SOPEdge
-	if err := tx.Where("sop_version_id = ? AND source_node_key = ? AND tenant_id = ?", run.SOPVersionID, run.CurrentNodeKey, run.TenantID).Order("priority,id").Find(&edges).Error; err != nil {
+	if err := tx.Where("sop_id = ? AND source_node_key = ? AND tenant_id = ?", run.SOPID, run.CurrentNodeKey, run.TenantID).Order("priority,id").Find(&edges).Error; err != nil {
 		return err
 	}
 	answers := map[string]interface{}{}
@@ -353,7 +348,7 @@ func advancePublicRun(tx *gorm.DB, run *model.SOPRun) error {
 		return errors.New("没有满足条件的下一节点")
 	}
 	var next model.SOPNode
-	if err := tx.Where("sop_version_id = ? AND node_key = ? AND tenant_id = ?", run.SOPVersionID, nextKey, run.TenantID).First(&next).Error; err != nil {
+	if err := tx.Where("sop_id = ? AND node_key = ? AND tenant_id = ?", run.SOPID, nextKey, run.TenantID).First(&next).Error; err != nil {
 		return err
 	}
 	updates := map[string]interface{}{"current_node_key": nextKey}
@@ -398,7 +393,7 @@ func (h *Handler) respondPublicMutationError(c *gin.Context, err error, fallback

 func (h *Handler) respondPublicRun(c *gin.Context, run model.SOPRun, token string) {
 	var node model.SOPNode
-	if err := h.db.Where("sop_version_id = ? AND node_key = ? AND tenant_id = ?", run.SOPVersionID, run.CurrentNodeKey, run.TenantID).First(&node).Error; err != nil {
+	if err := h.db.Where("sop_id = ? AND node_key = ? AND tenant_id = ?", run.SOPID, run.CurrentNodeKey, run.TenantID).First(&node).Error; err != nil {
 		response.Error(c, http.StatusInternalServerError, "NODE_NOT_FOUND", "当前流程节点不存在")
 		return
 	}
--- a/internal/run/start_presentation.go
+++ b/internal/run/start_presentation.go
@@ -56,8 +56,7 @@ func loadStartPresentation(db *gorm.DB, node model.SOPNode, tenantID uint64, con
 	if len(keys) > 0 {
 		if err := db.Table("scenario_fields sf").Select("sf.*").
 			Joins("JOIN sops s ON s.scenario_id = sf.scenario_id").
-			Joins("JOIN sop_versions sv ON sv.sop_id = s.id").
-			Where("sv.id = ? AND sf.tenant_id = ? AND sf.field_key IN ?", node.SOPVersionID, tenantID, keys).
+			Where("s.id = ? AND sf.tenant_id = ? AND sf.field_key IN ?", node.SOPID, tenantID, keys).
 			Find(&fields).Error; err != nil {
 			return nil, err
 		}