From 8cc0eced9b83050fe11591c4b5674beb58b79ae0 Mon Sep 17 00:00:00 2001
From: MaoMaoandSnail <1969945265@qq.com>
Date: Sat, 28 Sep 2024 22:29:20 +0800
Subject: [PATCH 1/2] bugfix: DesignerJson to StandardJson: SubStateMachine
 CompensateState cannot be recognized

---
 .../saga/statelang/parser/utils/DesignerJsonTransformer.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/saga/seata-saga-statelang/src/main/java/org/apache/seata/saga/statelang/parser/utils/DesignerJsonTransformer.java b/saga/seata-saga-statelang/src/main/java/org/apache/seata/saga/statelang/parser/utils/DesignerJsonTransformer.java
index d653b6708ae..7a69c8b5c25 100644
--- a/saga/seata-saga-statelang/src/main/java/org/apache/seata/saga/statelang/parser/utils/DesignerJsonTransformer.java
+++ b/saga/seata-saga-statelang/src/main/java/org/apache/seata/saga/statelang/parser/utils/DesignerJsonTransformer.java
@@ -122,7 +122,7 @@ private static void transformEdge(Map<String, Object> machineJsonObject, List<Ob
                     machineJsonObject.put("StartState", targetStateId);
                     //Make sure 'StartState' is before 'States'
                     machineJsonObject.put("States", machineJsonObject.remove("States"));
-                } else if ("ServiceTask".equals(sourceType)) {
+                } else if ("ServiceTask".equals(sourceType) || "SubStateMachine".equals(sourceType)) {
                     if (targetNode != null && "Compensation".equals(targetNode.get("stateType"))) {
                         sourceState.put("CompensateState", targetStateId);
                     } else {

From ed4bcedbf98d6c2193debc61baa5de8661d12cfa Mon Sep 17 00:00:00 2001
From: MaoMaoandSnail <1969945265@qq.com>
Date: Tue, 8 Oct 2024 11:18:18 +0800
Subject: [PATCH 2/2] optimize: add register pr information and author
 information

---
 changes/en-us/2.x.md | 1 +
 changes/zh-cn/2.x.md | 1 +
 2 files changed, 2 insertions(+)

diff --git a/changes/en-us/2.x.md b/changes/en-us/2.x.md
index 70b242675d8..96d8512a2dd 100644
--- a/changes/en-us/2.x.md
+++ b/changes/en-us/2.x.md
@@ -9,6 +9,7 @@ Add changes here for all PR submitted to the 2.x branch.
 
 ### bugfix:
 - [[#6899](https://github.com/apache/incubator-seata/pull/6899)] fix file.conf read failed after package
+- [[#6890](https://github.com/apache/incubator-seata/pull/6890)] fix designerJson to standardJson: subStateMachine compensateState cannot be recognized
 
 ### optimize:
 - [[#6826](https://github.com/apache/incubator-seata/pull/6826)] remove the branch registration operation of the XA read-only transaction
diff --git a/changes/zh-cn/2.x.md b/changes/zh-cn/2.x.md
index cbc9debeac9..b100d18320c 100644
--- a/changes/zh-cn/2.x.md
+++ b/changes/zh-cn/2.x.md
@@ -8,6 +8,7 @@
 
 ### bugfix:
 - [[#6899](https://github.com/apache/incubator-seata/pull/6899)] 修复file.conf打包后的读取
+- [[#6890](https://github.com/apache/incubator-seata/pull/6890)] 修复saga设计json转标准json过程中: 子状态机补偿节点无法被识别
 
 ### optimize:
 - [[#6826](https://github.com/apache/incubator-seata/pull/6826)] 移除只读XA事务的分支注册操作