工资维护标准列表查询调整

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,