diff --git a/packages/shared/lib/testUtil/mockApi/sqle/workflowTemplate/data.ts b/packages/shared/lib/testUtil/mockApi/sqle/workflowTemplate/data.ts
index dea106eebc..3d6a68ec6d 100644
--- a/packages/shared/lib/testUtil/mockApi/sqle/workflowTemplate/data.ts
+++ b/packages/shared/lib/testUtil/mockApi/sqle/workflowTemplate/data.ts
@@ -60,6 +60,68 @@ export const dataExportWorkflowTemplateData: IWorkflowTemplateDetailResV1 = {
   workflow_type: WorkflowTemplateDetailResV1WorkflowTypeEnum.data_export
 };
 
+/**
+ * Steps returned from API in wrong order (sql_execute first, then sql_review by descending number).
+ * Used to verify that the frontend correctly extracts steps by type and sorts review steps by number.
+ * Expected result after processing:
+ *   reviewSteps (sorted by number): [number:1 sql_review, number:2 sql_review]
+ *   execStep: number:3 sql_execute
+ */
+export const workflowTemplateOutOfOrderData = {
+  ...workflowTemplateData,
+  workflow_step_template_list: [
+    {
+      approved_by_authorized: false,
+      assignee_user_id_list: [],
+      execute_by_authorized: true,
+      number: 3,
+      type: 'sql_execute'
+    },
+    {
+      approved_by_authorized: false,
+      assignee_user_id_list: ['1739544663515205632'],
+      desc: 'step desc',
+      execute_by_authorized: false,
+      number: 2,
+      type: 'sql_review'
+    },
+    {
+      approved_by_authorized: true,
+      assignee_user_id_list: [],
+      execute_by_authorized: false,
+      number: 1,
+      type: 'sql_review'
+    }
+  ]
+};
+
+/**
+ * Export steps returned from API in wrong order (export_execute first).
+ * Expected result after processing:
+ *   reviewSteps (sorted by number): [number:1 export_review]
+ *   execStep: number:2 export_execute
+ */
+export const dataExportWorkflowTemplateOutOfOrderData: IWorkflowTemplateDetailResV1 =
+  {
+    ...dataExportWorkflowTemplateData,
+    workflow_step_template_list: [
+      {
+        approved_by_authorized: false,
+        assignee_user_id_list: [],
+        execute_by_authorized: true,
+        number: 2,
+        type: 'export_execute'
+      },
+      {
+        approved_by_authorized: true,
+        assignee_user_id_list: [],
+        execute_by_authorized: false,
+        number: 1,
+        type: 'export_review'
+      }
+    ]
+  };
+
 export const workflowTemplateListData = [
   workflowTemplateData,
   dataExportWorkflowTemplateData
diff --git a/packages/shared/lib/testUtil/mockApi/sqle/workflowTemplate/index.ts b/packages/shared/lib/testUtil/mockApi/sqle/workflowTemplate/index.ts
index 819cf80a27..dbc452b7a7 100644
--- a/packages/shared/lib/testUtil/mockApi/sqle/workflowTemplate/index.ts
+++ b/packages/shared/lib/testUtil/mockApi/sqle/workflowTemplate/index.ts
@@ -1,6 +1,10 @@
 import workflow from '../../../../api/sqle/service/workflow';
 import { MockSpyApy, createSpySuccessResponse } from '../../common';
-import { workflowTemplateData, workflowTemplateListData } from './data';
+import {
+  workflowTemplateData,
+  dataExportWorkflowTemplateData,
+  workflowTemplateListData
+} from './data';
 import { cloneDeep } from 'lodash';
 
 class MockWorkflowTemplateApi implements MockSpyApy {
@@ -19,7 +23,12 @@ class MockWorkflowTemplateApi implements MockSpyApy {
 
   public getWorkflowTemplate() {
     const spy = jest.spyOn(workflow, 'getWorkflowTemplateV1');
-    spy.mockImplementation(() => {
+    spy.mockImplementation((params) => {
+      if (params.workflow_type === 'data_export') {
+        return createSpySuccessResponse({
+          data: cloneDeep(dataExportWorkflowTemplateData)
+        });
+      }
       return createSpySuccessResponse({
         data: cloneDeep(workflowTemplateData)
       });
diff --git a/packages/sqle/src/page/WorkflowTemplate/UpdateWorkflowTemplate/__snapshots__/index.test.tsx.snap b/packages/sqle/src/page/WorkflowTemplate/UpdateWorkflowTemplate/__snapshots__/index.test.tsx.snap
index db6f251891..085631ab71 100644
--- a/packages/sqle/src/page/WorkflowTemplate/UpdateWorkflowTemplate/__snapshots__/index.test.tsx.snap
+++ b/packages/sqle/src/page/WorkflowTemplate/UpdateWorkflowTemplate/__snapshots__/index.test.tsx.snap
@@ -692,6 +692,532 @@ exports[`page/WorkflowTemplate/UpdateWorkflowTemplate change workflow template n
 </body>
 `;
 
+exports[`page/WorkflowTemplate/UpdateWorkflowTemplate data_export workflow type should correctly identify export_execute as exec step when API returns steps in wrong order 1`] = `
+<body>
+  <textarea
+    aria-hidden="true"
+    style="letter-spacing:normal;line-height:1.5714285714285714;padding-top:4px;padding-bottom:4px;font-family:-apple-system,BlinkMacSystemFont,'Segoe UI',Roboto,'Helvetica Neue',Arial,'Noto Sans',sans-serif,'Apple Color Emoji','Segoe UI Emoji','Segoe UI Symbol','Noto Color Emoji';font-weight:;font-size:14px;font-variant:;text-rendering:auto;text-transform:none;width:100%;text-indent:0;padding-left:11px;padding-right:11px;border-width:1px;box-sizing:border-box;word-break:;white-space:pre-wrap;
+  min-height:0 !important;
+  max-height:none !important;
+  height:0 !important;
+  visibility:hidden !important;
+  overflow:hidden !important;
+  position:absolute !important;
+  z-index:-1000 !important;
+  top:0 !important;
+  right:0 !important;
+  pointer-events: none !important;
+"
+    tab-index="-1"
+  />
+  <div>
+    <div
+      class="css-1w47t3a"
+    >
+      <div
+        class="ant-spin-nested-loading"
+      >
+        <div
+          class="ant-spin-container"
+        >
+          <div
+            class="actiontech-page-header-namespace css-ex8bfe"
+          >
+            <div
+              class="title"
+            >
+              <a
+                href="/sqle/project/700300/progress"
+              >
+                <button
+                  class="ant-btn ant-btn-default basic-button-wrapper css-10ae2zl"
+                  type="button"
+                >
+                  <span
+                    class="ant-btn-icon"
+                  >
+                    <span
+                      aria-label="arrow-left"
+                      class="anticon anticon-arrow-left"
+                      role="img"
+                    >
+                      <svg
+                        aria-hidden="true"
+                        data-icon="arrow-left"
+                        fill="currentColor"
+                        focusable="false"
+                        height="1em"
+                        viewBox="64 64 896 896"
+                        width="1em"
+                      >
+                        <path
+                          d="M872 474H286.9l350.2-304c5.6-4.9 2.2-14-5.2-14h-88.5c-3.9 0-7.6 1.4-10.5 3.9L155 487.8a31.96 31.96 0 000 48.3L535.1 866c1.5 1.3 3.3 2 5.2 2h91.5c7.4 0 10.8-9.2 5.2-14L286.9 550H872c4.4 0 8-3.6 8-8v-60c0-4.4-3.6-8-8-8z"
+                        />
+                      </svg>
+                    </span>
+                  </span>
+                  <span>
+                    编辑审批流程 - 数据导出
+                  </span>
+                </button>
+              </a>
+            </div>
+            <div
+              class="extra"
+            >
+              <div
+                class="ant-space ant-space-horizontal ant-space-align-center"
+              >
+                <div
+                  class="ant-space-item"
+                  style="margin-right: 8px;"
+                >
+                  <button
+                    class="ant-btn ant-btn-default basic-button-wrapper css-10ae2zl"
+                    type="button"
+                  >
+                    <span>
+                      重 置
+                    </span>
+                  </button>
+                </div>
+                <div
+                  class="ant-space-item"
+                >
+                  <button
+                    class="ant-btn ant-btn-primary basic-button-wrapper css-10ae2zl"
+                    type="button"
+                  >
+                    <span>
+                      保 存
+                    </span>
+                  </button>
+                </div>
+              </div>
+            </div>
+          </div>
+          <div
+            class="ant-row workflow-template-wrapper"
+          >
+            <div
+              class="ant-col"
+              style="flex-basis: auto;"
+            >
+              <div
+                class="css-1j4pcp2"
+              >
+                <div
+                  class="ant-row ant-row-no-wrap workflow-step-container workflow-card-space"
+                >
+                  <div
+                    class="ant-col icon-wrapper"
+                  >
+                    <span
+                      class="add-file-icon"
+                    >
+                      <svg
+                        color="white"
+                        fill="currentColor"
+                        height="14"
+                        viewBox="0 0 14 14"
+                        width="14"
+                        xmlns="http://www.w3.org/2000/svg"
+                      >
+                        <path
+                          d="m9.333 1.167 2.917 2.916v8.172a.58.58 0 0 1-.58.578H2.33a.583.583 0 0 1-.58-.578V1.745c0-.32.26-.578.58-.578zm-2.916 5.25h-1.75v1.166h1.75v1.75h1.166v-1.75h1.75V6.417h-1.75v-1.75H6.417z"
+                        />
+                      </svg>
+                    </span>
+                  </div>
+                  <div
+                    class="ant-col step-box"
+                  >
+                    <div
+                      class="ant-row ant-row-no-wrap"
+                    >
+                      <div
+                        class="ant-card ant-card-bordered step-card-style disable-step-card css-18lc8oi"
+                      >
+                        <div
+                          class="ant-card-body"
+                        >
+                          <span
+                            class="step-card-title"
+                          >
+                            工单发起/工单更新SQL语句
+                          </span>
+                          <div
+                            class="step-card-desc"
+                          >
+                            工单被创建，或者工单被驳回后等待修改SQL语句
+                          </div>
+                        </div>
+                      </div>
+                    </div>
+                  </div>
+                </div>
+                <div
+                  aria-describedby="DndDescribedBy-8"
+                  aria-disabled="false"
+                  aria-roledescription="sortable"
+                  class="ant-row ant-row-no-wrap workflow-step-container workflow-card-space"
+                  role="button"
+                  style="cursor: move; transition: transform 0ms linear;"
+                  tabindex="0"
+                >
+                  <div
+                    class="ant-col icon-wrapper"
+                  >
+                    <span
+                      class="audit-icon"
+                    >
+                      <svg
+                        color="white"
+                        fill="currentColor"
+                        height="14"
+                        viewBox="0 0 14 14"
+                        width="14"
+                        xmlns="http://www.w3.org/2000/svg"
+                      >
+                        <path
+                          d="M8.167 5.833c0-.554.33-1.043.671-1.48a2.333 2.333 0 1 0-3.677 0c.342.437.672.926.672 1.48H2.917c-.645 0-1.167.523-1.167 1.167v2.333c0 .323.261.584.583.584h9.334a.583.583 0 0 0 .583-.584V7c0-.644-.522-1.167-1.167-1.167zM12.25 12.25v-1.167H1.75v1.167z"
+                        />
+                      </svg>
+                    </span>
+                  </div>
+                  <div
+                    class="ant-col step-box"
+                  >
+                    <div
+                      class="ant-row ant-row-no-wrap"
+                    >
+                      <div
+                        class="ant-card ant-card-bordered step-card-style disable-step-card css-18lc8oi"
+                      >
+                        <div
+                          class="ant-card-body"
+                        >
+                          <span
+                            class="step-card-title"
+                          >
+                            审核节点
+                            <span
+                              class="review-index-text"
+                            >
+                              #1
+                            </span>
+                          </span>
+                          <div
+                            class="step-card-desc"
+                          >
+                            -
+                          </div>
+                          <div
+                            class="step-card-operator"
+                          >
+                            <div
+                              class="operator-title"
+                            >
+                              审核人
+                            </div>
+                            <div
+                              class="operator-content"
+                            >
+                              <svg
+                                color="#1CB889"
+                                height="18"
+                                viewBox="0 0 16 16"
+                                width="18"
+                                xmlns="http://www.w3.org/2000/svg"
+                              >
+                                <path
+                                  d="M8 1.333A6.67 6.67 0 0 1 14.666 8 6.67 6.67 0 0 1 8 14.667 6.67 6.67 0 0 1 1.333 8 6.67 6.67 0 0 1 8 1.333m-3.985 8.944c.979 1.46 2.448 2.39 4.091 2.39s3.113-.93 4.091-2.39a5.98 5.98 0 0 0-4.09-1.61 5.98 5.98 0 0 0-4.092 1.61M8 7.333a2 2 0 1 0 0-4 2 2 0 0 0 0 4"
+                                  fill="currentColor"
+                                />
+                              </svg>
+                              <span
+                                class="review-exec-auth-text"
+                              >
+                                匹配拥有数据源审核权限的成员
+                              </span>
+                            </div>
+                          </div>
+                        </div>
+                      </div>
+                    </div>
+                  </div>
+                </div>
+                <div
+                  class="ant-row add-review-node-icon workflow-step-container"
+                >
+                  <button
+                    class="ant-btn ant-btn-dashed basic-button-wrapper css-1oe3ds5"
+                    type="button"
+                  >
+                    <span
+                      class="ant-btn-icon"
+                    >
+                      <span
+                        aria-label="plus"
+                        class="anticon anticon-plus"
+                        role="img"
+                      >
+                        <svg
+                          aria-hidden="true"
+                          data-icon="plus"
+                          fill="currentColor"
+                          focusable="false"
+                          height="1em"
+                          viewBox="64 64 896 896"
+                          width="1em"
+                        >
+                          <path
+                            d="M482 152h60q8 0 8 8v704q0 8-8 8h-60q-8 0-8-8V160q0-8 8-8z"
+                          />
+                          <path
+                            d="M192 474h672q8 0 8 8v60q0 8-8 8H160q-8 0-8-8v-60q0-8 8-8z"
+                          />
+                        </svg>
+                      </span>
+                    </span>
+                    <span>
+                      添加审核节点
+                    </span>
+                  </button>
+                </div>
+                <div
+                  class="ant-row ant-row-no-wrap workflow-step-container workflow-card-space"
+                >
+                  <div
+                    class="ant-col icon-wrapper"
+                  >
+                    <span
+                      class="send-plane-icon"
+                    >
+                      <svg
+                        color="white"
+                        fill="currentColor"
+                        height="14"
+                        viewBox="0 0 14 14"
+                        width="14"
+                        xmlns="http://www.w3.org/2000/svg"
+                      >
+                        <path
+                          d="M1.135 5.434c-.304-.102-.307-.266.006-.37l11.134-3.711c.309-.103.485.07.4.372L9.492 12.858c-.088.309-.266.32-.396.027L7 8.167 10.5 3.5 5.833 7z"
+                        />
+                      </svg>
+                    </span>
+                  </div>
+                  <div
+                    class="ant-col step-box"
+                  >
+                    <div
+                      class="ant-row ant-row-no-wrap"
+                    >
+                      <div
+                        class="ant-card ant-card-bordered ant-card-hoverable step-card-style css-18lc8oi"
+                      >
+                        <div
+                          class="ant-card-body"
+                        >
+                          <span
+                            class="step-card-title"
+                          >
+                            执行导出
+                          </span>
+                          <div
+                            class="step-card-desc"
+                          >
+                            -
+                          </div>
+                          <div
+                            class="step-card-operator"
+                          >
+                            <div
+                              class="operator-title"
+                            >
+                              执行人
+                            </div>
+                            <div
+                              class="operator-content"
+                            >
+                              <svg
+                                color="#1CB889"
+                                height="18"
+                                viewBox="0 0 16 16"
+                                width="18"
+                                xmlns="http://www.w3.org/2000/svg"
+                              >
+                                <path
+                                  d="M8 1.333A6.67 6.67 0 0 1 14.666 8 6.67 6.67 0 0 1 8 14.667 6.67 6.67 0 0 1 1.333 8 6.67 6.67 0 0 1 8 1.333m-3.985 8.944c.979 1.46 2.448 2.39 4.091 2.39s3.113-.93 4.091-2.39a5.98 5.98 0 0 0-4.09-1.61 5.98 5.98 0 0 0-4.092 1.61M8 7.333a2 2 0 1 0 0-4 2 2 0 0 0 0 4"
+                                  fill="currentColor"
+                                />
+                              </svg>
+                              <span
+                                class="review-exec-auth-text"
+                              >
+                                数据导出的执行人默认为工单创建者，不可修改。
+                              </span>
+                            </div>
+                          </div>
+                        </div>
+                      </div>
+                    </div>
+                  </div>
+                </div>
+              </div>
+              <div
+                id="DndDescribedBy-8"
+                style="display: none;"
+              >
+                
+    To pick up a draggable item, press the space bar.
+    While dragging, use the arrow keys to move the item.
+    Press space again to drop the item in its new position, or press escape to cancel.
+  
+              </div>
+              <div
+                aria-atomic="true"
+                aria-live="assertive"
+                id="DndLiveRegion-8"
+                role="status"
+                style="position: fixed; top: 0px; left: 0px; width: 1px; height: 1px; margin: -1px; border: 0px; padding: 0px; overflow: hidden; clip-path: inset(100%); white-space: nowrap;"
+              />
+            </div>
+            <div
+              class="ant-col workflow-template-right-module"
+              style="flex: 0 0 360px;"
+            >
+              <div
+                class="css-u6p6f9"
+              >
+                <div
+                  class="step-title-wrapper"
+                >
+                  <div
+                    class="step-title"
+                  >
+                    执行导出
+                  </div>
+                  <div
+                    class="step-title-info"
+                  >
+                    编辑审核流程，执行人在该步骤可以执行「执行导出」或「驳回」操作
+                  </div>
+                </div>
+                <div
+                  class="step-info-wrapper"
+                >
+                  <form
+                    class="ant-form ant-form-vertical ant-form-hide-required-mark"
+                  >
+                    <div
+                      class="css-4a4iba"
+                    >
+                      <span
+                        class="ant-typography step-alert-title"
+                      >
+                        <span
+                          aria-label="info-circle"
+                          class="anticon anticon-info-circle step-alert-title-tips-icon"
+                          role="img"
+                        >
+                          <svg
+                            aria-hidden="true"
+                            data-icon="info-circle"
+                            fill="currentColor"
+                            focusable="false"
+                            height="1em"
+                            viewBox="64 64 896 896"
+                            width="1em"
+                          >
+                            <path
+                              d="M512 64C264.6 64 64 264.6 64 512s200.6 448 448 448 448-200.6 448-448S759.4 64 512 64zm0 820c-205.4 0-372-166.6-372-372s166.6-372 372-372 372 166.6 372 372-166.6 372-372 372z"
+                            />
+                            <path
+                              d="M464 336a48 48 0 1096 0 48 48 0 10-96 0zm72 112h-48c-4.4 0-8 3.6-8 8v272c0 4.4 3.6 8 8 8h48c4.4 0 8-3.6 8-8V456c0-4.4-3.6-8-8-8z"
+                            />
+                          </svg>
+                        </span>
+                        数据导出的执行人默认为工单创建者，不可修改。
+                      </span>
+                    </div>
+                    <div
+                      class="css-1uvv7g7"
+                    >
+                      <button
+                        class="ant-btn ant-btn-default basic-button-wrapper css-10ae2zl"
+                        type="button"
+                      >
+                        <span>
+                          上一步
+                        </span>
+                      </button>
+                    </div>
+                  </form>
+                  <div
+                    class="ant-divider ant-divider-horizontal step-info-divider"
+                    role="separator"
+                  />
+                  <div
+                    class="css-4a4iba"
+                  >
+                    <span
+                      class="ant-typography step-alert-title"
+                    >
+                      <span
+                        aria-label="info-circle"
+                        class="anticon anticon-info-circle step-alert-title-tips-icon"
+                        role="img"
+                      >
+                        <svg
+                          aria-hidden="true"
+                          data-icon="info-circle"
+                          fill="currentColor"
+                          focusable="false"
+                          height="1em"
+                          viewBox="64 64 896 896"
+                          width="1em"
+                        >
+                          <path
+                            d="M512 64C264.6 64 64 264.6 64 512s200.6 448 448 448 448-200.6 448-448S759.4 64 512 64zm0 820c-205.4 0-372-166.6-372-372s166.6-372 372-372 372 166.6 372 372-166.6 372-372 372z"
+                          />
+                          <path
+                            d="M464 336a48 48 0 1096 0 48 48 0 10-96 0zm72 112h-48c-4.4 0-8 3.6-8 8v272c0 4.4 3.6 8 8 8h48c4.4 0 8-3.6 8-8V456c0-4.4-3.6-8-8-8z"
+                          />
+                        </svg>
+                      </span>
+                      创建/更新审批流程时请注意以下几点：
+                    </span>
+                    <div
+                      class="ant-typography step-alert-content"
+                    >
+                      <ul
+                        class="step-alert-item-icon"
+                      >
+                        <li>
+                          审核流程自工单发起开始，通过设置的审核步骤后，最后以执行导出结束；
+                        </li>
+                        <li>
+                          审核流程模板最多可设置4个审核步骤，也可不设置审核步骤；
+                        </li>
+                        <li>
+                          单个步骤指定执行人时，最少需要添加一个指定人，最多只能添加十个指定人。
+                        </li>
+                      </ul>
+                    </div>
+                  </div>
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</body>
+`;
+
 exports[`page/WorkflowTemplate/UpdateWorkflowTemplate no review node in template 1`] = `
 <body>
   <textarea
@@ -1039,7 +1565,7 @@ exports[`page/WorkflowTemplate/UpdateWorkflowTemplate no review node in template
                 </div>
               </div>
               <div
-                id="DndDescribedBy-4"
+                id="DndDescribedBy-5"
                 style="display: none;"
               >
                 
@@ -1051,7 +1577,7 @@ exports[`page/WorkflowTemplate/UpdateWorkflowTemplate no review node in template
               <div
                 aria-atomic="true"
                 aria-live="assertive"
-                id="DndLiveRegion-4"
+                id="DndLiveRegion-5"
                 role="status"
                 style="position: fixed; top: 0px; left: 0px; width: 1px; height: 1px; margin: -1px; border: 0px; padding: 0px; overflow: hidden; clip-path: inset(100%); white-space: nowrap;"
               />
diff --git a/packages/sqle/src/page/WorkflowTemplate/UpdateWorkflowTemplate/index.test.tsx b/packages/sqle/src/page/WorkflowTemplate/UpdateWorkflowTemplate/index.test.tsx
index ecbc1dda15..3eb473e0dc 100644
--- a/packages/sqle/src/page/WorkflowTemplate/UpdateWorkflowTemplate/index.test.tsx
+++ b/packages/sqle/src/page/WorkflowTemplate/UpdateWorkflowTemplate/index.test.tsx
@@ -1,6 +1,10 @@
 import { sqleSuperRender } from '../../../testUtils/superRender';
 import UpdateWorkflowTemplate from '.';
 import { workflowTemplateData } from '@actiontech/shared/lib/testUtil/mockApi/sqle/workflowTemplate/data';
+import {
+  workflowTemplateOutOfOrderData,
+  dataExportWorkflowTemplateData
+} from '@actiontech/shared/lib/testUtil/mockApi/sqle/workflowTemplate/data';
 import { act, fireEvent, screen, cleanup } from '@testing-library/react';
 import {
   getAllBySelector,
@@ -224,6 +228,36 @@ describe('page/WorkflowTemplate/UpdateWorkflowTemplate', () => {
     expect(getAllBySelector('.ant-card').length).toBe(3);
   });
 
+  it('should extract exec and review steps by type regardless of position in API response', async () => {
+    const getInfoRequest = workflowTemplate.getWorkflowTemplate();
+    // workflowTemplateOutOfOrderData: [sql_execute(3), sql_review(2, desc='step desc'), sql_review(1)]
+    // Without type-based filter (old pop() logic), pop() would give sql_review(1) as exec step
+    // With new filter logic, sql_execute(3) is correctly identified as exec step
+    getInfoRequest.mockImplementation(() =>
+      createSpySuccessResponse({
+        data: cloneDeep(workflowTemplateOutOfOrderData)
+      })
+    );
+    user.getUserTipList();
+    customRender();
+    await act(async () => jest.advanceTimersByTime(3000));
+    await act(async () => jest.advanceTimersByTime(3000));
+
+    // 2 review steps + exec step = 3 cards (+ create card + title card)
+    expect(getAllBySelector('.ant-card').length).toBe(5);
+
+    // Navigate to exec step (step index 3: after 2 review steps)
+    fireEvent.click(screen.getByText('下一步'));
+    await act(async () => jest.advanceTimersByTime(3000));
+    fireEvent.click(screen.getByText('下一步'));
+    await act(async () => jest.advanceTimersByTime(3000));
+    fireEvent.click(screen.getByText('下一步'));
+    await act(async () => jest.advanceTimersByTime(3000));
+
+    // Exec step is sql_execute (execute_by_authorized: true) → checkbox should be checked
+    expect(getBySelector('#execute_by_authorized')).toBeChecked();
+  });
+
   it('no review node in template', async () => {
     const getInfoRequest = workflowTemplate.getWorkflowTemplate();
     const tempData = cloneDeep(workflowTemplateData);
@@ -294,5 +328,48 @@ describe('page/WorkflowTemplate/UpdateWorkflowTemplate', () => {
         })
       );
     });
+
+    it('should correctly identify export_execute as exec step when API returns steps in wrong order', async () => {
+      const getInfoRequest = workflowTemplate.getWorkflowTemplate();
+      // Override: return dataExportWorkflowTemplateData but with steps in wrong order
+      // [export_execute(2) first, export_review(1) second]
+      getInfoRequest.mockImplementation(() =>
+        createSpySuccessResponse({
+          data: {
+            ...cloneDeep(dataExportWorkflowTemplateData),
+            workflow_step_template_list: [
+              {
+                approved_by_authorized: false,
+                assignee_user_id_list: [],
+                execute_by_authorized: true,
+                number: 2,
+                type: 'export_execute'
+              },
+              {
+                approved_by_authorized: true,
+                assignee_user_id_list: [],
+                execute_by_authorized: false,
+                number: 1,
+                type: 'export_review'
+              }
+            ]
+          }
+        })
+      );
+      user.getUserTipList();
+      const { baseElement } = customRender();
+      await act(async () => jest.advanceTimersByTime(3000));
+      await act(async () => jest.advanceTimersByTime(3000));
+
+      // 1 export_review step + exec step = 2 step cards (+ create card)
+      expect(getAllBySelector('.ant-card').length).toBe(3);
+
+      // Navigate to exec step
+      fireEvent.click(screen.getByText('下一步'));
+      await act(async () => jest.advanceTimersByTime(3000));
+      fireEvent.click(screen.getByText('下一步'));
+      await act(async () => jest.advanceTimersByTime(3000));
+      expect(baseElement).toMatchSnapshot();
+    });
   });
 });
diff --git a/packages/sqle/src/page/WorkflowTemplate/UpdateWorkflowTemplate/index.tsx b/packages/sqle/src/page/WorkflowTemplate/UpdateWorkflowTemplate/index.tsx
index 82818363b4..aae6262cb1 100644
--- a/packages/sqle/src/page/WorkflowTemplate/UpdateWorkflowTemplate/index.tsx
+++ b/packages/sqle/src/page/WorkflowTemplate/UpdateWorkflowTemplate/index.tsx
@@ -1,9 +1,5 @@
 import { BasicButton, BasicResult, PageHeader } from '@actiontech/dms-kit';
-import {
-  ActionButton,
-  useTypedParams,
-  useTypedQuery
-} from '@actiontech/shared';
+import { ActionButton, useTypedQuery } from '@actiontech/shared';
 import { ArrowLeftOutlined } from '@ant-design/icons';
 import { Col, Row, Space, Spin } from 'antd';
 import React, { useEffect, useState } from 'react';
@@ -38,6 +34,7 @@ import {
   getWorkflowTemplateV1WorkflowTypeEnum,
   updateWorkflowTemplateV1WorkflowTypeEnum
 } from '@actiontech/shared/lib/api/sqle/service/workflow/index.enum';
+import { WorkflowStepTypeEnum } from '../WorkflowTemplateDetail/enum';
 
 const UpdateWorkflowTemplate: React.FC = () => {
   const { t } = useTranslation();
@@ -150,9 +147,30 @@ const UpdateWorkflowTemplate: React.FC = () => {
               if (stepList.length <= 1) {
                 setExecSteps(stepList[0]);
               } else {
-                const execStep = stepList.pop();
-                setReviewSteps(stepList);
-                if (execStep) setExecSteps(execStep);
+                const execSteps = stepList.filter(
+                  (v) =>
+                    v.type ===
+                    (workflowType ===
+                    getWorkflowTemplateV1WorkflowTypeEnum.workflow
+                      ? WorkflowStepTypeEnum.sql_execute
+                      : WorkflowStepTypeEnum.export_execute)
+                );
+                const reviewSteps = stepList
+                  .filter(
+                    (v) =>
+                      v.type ===
+                      (workflowType ===
+                      getWorkflowTemplateV1WorkflowTypeEnum.workflow
+                        ? WorkflowStepTypeEnum.sql_review
+                        : WorkflowStepTypeEnum.export_review)
+                  )
+                  .sort((a, b) => (a.number ?? 0) - (b.number ?? 0));
+                setReviewSteps(reviewSteps);
+                if (execSteps.length === 1) {
+                  setExecSteps(execSteps[0]);
+                } else {
+                  setExecSteps({ assignee_user_id_list: [], desc: '' });
+                }
               }
             }
             return res.data.data;
@@ -327,7 +345,10 @@ const UpdateWorkflowTemplate: React.FC = () => {
                 exchangeReviewNode={handleExchangeReviewNode}
                 clickReviewNode={handleClickReviewNode}
                 usernameList={usernameList}
-                isDataExport={workflowType === 'data_export'}
+                isDataExport={
+                  workflowType ===
+                  getWorkflowTemplateV1WorkflowTypeEnum.data_export
+                }
               />
             </Col>
             <Col
diff --git a/packages/sqle/src/page/WorkflowTemplate/WorkflowTemplateDetail/enum.ts b/packages/sqle/src/page/WorkflowTemplate/WorkflowTemplateDetail/enum.ts
new file mode 100644
index 0000000000..8c0df47266
--- /dev/null
+++ b/packages/sqle/src/page/WorkflowTemplate/WorkflowTemplateDetail/enum.ts
@@ -0,0 +1,6 @@
+export enum WorkflowStepTypeEnum {
+  sql_review = 'sql_review',
+  sql_execute = 'sql_execute',
+  export_review = 'export_review',
+  export_execute = 'export_execute'
+}
diff --git a/packages/sqle/src/page/WorkflowTemplate/WorkflowTemplateDetail/index.test.tsx b/packages/sqle/src/page/WorkflowTemplate/WorkflowTemplateDetail/index.test.tsx
index 2c017746f9..d1a63ca403 100644
--- a/packages/sqle/src/page/WorkflowTemplate/WorkflowTemplateDetail/index.test.tsx
+++ b/packages/sqle/src/page/WorkflowTemplate/WorkflowTemplateDetail/index.test.tsx
@@ -1,7 +1,14 @@
 import { sqleSuperRender } from '../../../testUtils/superRender';
 import WorkflowTemplateDetail from '.';
-import { act, cleanup, screen } from '@testing-library/react';
+import { act, cleanup, fireEvent, screen } from '@testing-library/react';
 import workflowTemplate from '@actiontech/shared/lib/testUtil/mockApi/sqle/workflowTemplate';
+import {
+  workflowTemplateOutOfOrderData,
+  dataExportWorkflowTemplateOutOfOrderData,
+  dataExportWorkflowTemplateData
+} from '@actiontech/shared/lib/testUtil/mockApi/sqle/workflowTemplate/data';
+import { createSpySuccessResponse } from '@actiontech/shared/lib/testUtil/mockApi';
+import { cloneDeep } from 'lodash';
 import { mockUseCurrentProject } from '@actiontech/shared/lib/testUtil/mockHook/mockUseCurrentProject';
 import { mockUseCurrentUser } from '@actiontech/shared/lib/testUtil/mockHook/mockUseCurrentUser';
 import { mockUsePermission } from '@actiontech/shared/lib/testUtil/mockHook/mockUsePermission';
@@ -50,4 +57,77 @@ describe('page/WorkflowTemplate/WorkflowTemplateDetail', () => {
     expect(screen.getByText('上线工单')).toBeInTheDocument();
     expect(screen.getByText('数据导出')).toBeInTheDocument();
   });
+
+  it('should sort sql review steps by number ascending when API returns steps in wrong order', async () => {
+    const getTemplateRequest = workflowTemplate.getWorkflowTemplate();
+    getTemplateRequest.mockImplementation((params) => {
+      if (params.workflow_type === 'data_export') {
+        return createSpySuccessResponse({
+          data: cloneDeep(dataExportWorkflowTemplateData)
+        });
+      }
+      return createSpySuccessResponse({
+        data: cloneDeep(workflowTemplateOutOfOrderData)
+      });
+    });
+    customRender();
+    await act(async () => jest.advanceTimersByTime(3000));
+
+    // workflowTemplateOutOfOrderData has steps in order: sql_execute(3), sql_review(2, desc='step desc'), sql_review(1, approved_by_authorized)
+    // After filter + sort by number: reviewSteps = [sql_review(1), sql_review(2)], execStep = sql_execute(3)
+    // Rendered order: create → review#1(approved_by_authorized) → review#2(desc='step desc') → exec
+    const reviewStep1Indicator =
+      screen.getByText('匹配拥有数据源审核权限的成员');
+    const reviewStep2Desc = screen.getByText('step desc');
+
+    // review#1 (number:1, approved_by_authorized) must appear before review#2 (number:2, desc='step desc')
+    expect(
+      reviewStep1Indicator.compareDocumentPosition(reviewStep2Desc) &
+        Node.DOCUMENT_POSITION_FOLLOWING
+    ).toBeTruthy();
+
+    // exec step correctly identified as sql_execute (execute_by_authorized:true)
+    expect(
+      screen.getByText('匹配拥有数据源上线权限的成员')
+    ).toBeInTheDocument();
+  });
+
+  it('should sort export review steps by number ascending when API returns steps in wrong order', async () => {
+    const getTemplateRequest = workflowTemplate.getWorkflowTemplate();
+    getTemplateRequest.mockImplementation((params) => {
+      if (params.workflow_type === 'data_export') {
+        return createSpySuccessResponse({
+          data: cloneDeep(dataExportWorkflowTemplateOutOfOrderData)
+        });
+      }
+      return createSpySuccessResponse({
+        data: cloneDeep(workflowTemplateOutOfOrderData)
+      });
+    });
+    customRender();
+    await act(async () => jest.advanceTimersByTime(3000));
+
+    fireEvent.click(screen.getByText('数据导出'));
+    await act(async () => jest.advanceTimersByTime(3000));
+
+    // dataExportWorkflowTemplateOutOfOrderData has steps: export_execute(2) first, export_review(1) second
+    // After filter + sort: reviewSteps = [export_review(1)], execStep = export_execute(2)
+    // exec step is correctly export_execute (execute_by_authorized:true, isDataExport=true)
+    // → shows "数据导出的执行人默认为工单创建者，不可修改。"
+    expect(
+      screen.getByText('数据导出的执行人默认为工单创建者，不可修改。')
+    ).toBeInTheDocument();
+
+    // review step is correctly export_review (approved_by_authorized:true)
+    // → shows "匹配拥有数据源审核权限的成员"
+    // exec step (执行导出) must appear after the review step
+    const reviewStep = screen.getAllByText('匹配拥有数据源审核权限的成员')[0];
+    const execStepUser = screen.getByText(
+      '数据导出的执行人默认为工单创建者，不可修改。'
+    );
+    expect(
+      reviewStep.compareDocumentPosition(execStepUser) &
+        Node.DOCUMENT_POSITION_FOLLOWING
+    ).toBeTruthy();
+  });
 });
diff --git a/packages/sqle/src/page/WorkflowTemplate/WorkflowTemplateDetail/index.tsx b/packages/sqle/src/page/WorkflowTemplate/WorkflowTemplateDetail/index.tsx
index 40885f6891..28dfd967aa 100644
--- a/packages/sqle/src/page/WorkflowTemplate/WorkflowTemplateDetail/index.tsx
+++ b/packages/sqle/src/page/WorkflowTemplate/WorkflowTemplateDetail/index.tsx
@@ -14,6 +14,7 @@ import { WorkflowTemplateStyleWrapper } from './style';
 import useUsername from '../../../hooks/useUsername';
 import { getWorkflowTemplateV1WorkflowTypeEnum } from '@actiontech/shared/lib/api/sqle/service/workflow/index.enum';
 import { workflowTemplateDetailAction } from './actions';
+import { WorkflowStepTypeEnum } from './enum';
 
 const WorkflowTemplateDetail: React.FC = () => {
   const { t } = useTranslation();
@@ -70,9 +71,18 @@ const WorkflowTemplateDetail: React.FC = () => {
               );
               setWorkflowReviewSteps([]);
             } else {
-              const execStep = stepList.pop();
-              setWorkflowReviewSteps(stepList);
-              if (execStep) setWorkflowExecStep(execStep);
+              const execSteps = stepList.filter(
+                (v) => v.type === WorkflowStepTypeEnum.sql_execute
+              );
+              const reviewSteps = stepList
+                .filter((v) => v.type === WorkflowStepTypeEnum.sql_review)
+                .sort((a, b) => (a.number ?? 0) - (b.number ?? 0));
+              setWorkflowReviewSteps(reviewSteps);
+              if (execSteps.length === 1) {
+                setWorkflowExecStep(execSteps[0]);
+              } else {
+                setWorkflowExecStep({ assignee_user_id_list: [], desc: '' });
+              }
             }
             return res.data.data;
           }),
@@ -107,9 +117,20 @@ const WorkflowTemplateDetail: React.FC = () => {
               );
               setExportReviewSteps([]);
             } else {
-              const execStep = stepList.pop();
-              setExportReviewSteps(stepList);
-              if (execStep) setExportExecStep(execStep);
+              const execSteps = stepList.filter(
+                (v) => v.type === WorkflowStepTypeEnum.export_execute
+              );
+              const reviewSteps = stepList
+                .filter((v) => v.type === WorkflowStepTypeEnum.export_review)
+                .sort((a, b) => (a.number ?? 0) - (b.number ?? 0));
+              setExportReviewSteps(reviewSteps);
+              if (execSteps.length === 1) {
+                setExportExecStep(execSteps[0]);
+              } else {
+                setExportExecStep(
+                  stepList[0] ?? { assignee_user_id_list: [], desc: '' }
+                );
+              }
             }
             return res.data.data;
           }),