From 8fdb3204174a1bcbccee4106dfd27bae4cdb4292 Mon Sep 17 00:00:00 2001
From: maxiangong <298222784@qq.com>
Date: Tue, 28 Apr 2026 10:13:32 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E8=B5=84=E7=BB=B4=E6=8A=A4=E6=A0=87?=
 =?UTF-8?q?=E5=87=86=E5=88=97=E8=A1=A8=E6=9F=A5=E8=AF=A2=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/SalaryStandardMapper.xml           | 33 +++++++++++++++++--
 1 file changed, 31 insertions(+), 2 deletions(-)

diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/efficiency/mapper/SalaryStandardMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/efficiency/mapper/SalaryStandardMapper.xml
index 7e37c0b0..ba52ccbe 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/efficiency/mapper/SalaryStandardMapper.xml
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/efficiency/mapper/SalaryStandardMapper.xml
@@ -104,11 +104,40 @@
         PROCESS_NAME,
         NULL AS minStep,
         NULL AS maxStep,
-        TO_NUMBER(STEP_SETTLEMENT_PRICE) AS PRICE
+        NULL AS PRICE
         FROM
         STEP_DATA
         WHERE
-        STEP_TYPE IN ( 1, 2 ) UNION ALL
+        STEP_TYPE = 1
+        UNION ALL
+        SELECT
+        ID,
+        STANDARD_TYPE,
+        PROCESS_ID,
+        PART_NO,
+        SETTLEMENT_PRICE,
+        SETTLEMENT_UNIT,
+        STEP_TYPE,
+        STEP,
+        STEP_UNIT,
+        STEP_SETTLEMENT_PRICE,
+        STEP_SETTLEMENT_UNIT,
+        CREATE_USER,
+        CREATE_DEPT,
+        CREATE_TIME,
+        UPDATE_USER,
+        UPDATE_TIME,
+        STATUS,
+        IS_DELETED,
+        PROCESS_NAME,
+        TO_NUMBER( STEP ) AS minStep,
+        NULL AS maxStep,
+        TO_NUMBER( STEP_SETTLEMENT_PRICE ) AS PRICE
+        FROM
+        STEP_DATA
+        WHERE
+        STEP_TYPE = 2
+        UNION ALL
         SELECT
         sd.ID,
         sd.STANDARD_TYPE,