diff --git a/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskStepDataGetApi.java b/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskStepDataGetApi.java
index f096e158cd42e84f89cd8b77f7db08a2fca3f5e4..2b7b56cbc500e505f705627d17cf7ec71fb158b0 100755
--- a/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskStepDataGetApi.java
+++ b/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskStepDataGetApi.java
@@ -1,22 +1,20 @@
 package neatlogic.module.process.api.processtask;
 
-import neatlogic.framework.auth.core.AuthAction;
-import neatlogic.framework.process.auth.PROCESS_BASE;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
 import com.alibaba.fastjson.JSONObject;
-
+import neatlogic.framework.auth.core.AuthAction;
 import neatlogic.framework.common.constvalue.ApiParamType;
-import neatlogic.module.process.dao.mapper.processtask.ProcessTaskStepDataMapper;
+import neatlogic.framework.process.auth.PROCESS_BASE;
 import neatlogic.framework.process.dto.ProcessTaskStepDataVo;
+import neatlogic.framework.restful.annotation.*;
 import neatlogic.framework.restful.constvalue.OperationTypeEnum;
-import neatlogic.framework.restful.annotation.Description;
-import neatlogic.framework.restful.annotation.Input;
-import neatlogic.framework.restful.annotation.OperationType;
-import neatlogic.framework.restful.annotation.Output;
-import neatlogic.framework.restful.annotation.Param;
 import neatlogic.framework.restful.core.privateapi.PrivateApiComponentBase;
+import neatlogic.framework.util.TableResultUtil;
+import neatlogic.module.process.dao.mapper.processtask.ProcessTaskStepDataMapper;
+import org.apache.commons.collections4.CollectionUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
 
 @Service
 @AuthAction(action = PROCESS_BASE.class)
@@ -41,16 +39,43 @@ public class ProcessTaskStepDataGetApi extends PrivateApiComponentBase {
         return null;
     }
 
-    @Input({@Param(name = "processTaskId", type = ApiParamType.LONG, isRequired = true, desc = "工单id"),
-        @Param(name = "processTaskStepId", type = ApiParamType.LONG, isRequired = true, desc = "工单步骤id")})
-    @Output({@Param(type = ApiParamType.STRING)})
+    @Input({
+            @Param(name = "id", type = ApiParamType.LONG, desc = "common.id"),
+            @Param(name = "processTaskId", type = ApiParamType.LONG, desc = "term.itsm.processtaskid"),
+            @Param(name = "processTaskStepId", type = ApiParamType.LONG, desc = "term.itsm.processtaskstepid"),
+            @Param(name = "type", type = ApiParamType.STRING, desc = "common.type"),
+            @Param(name = "fcu", type = ApiParamType.STRING, desc = "common.createuser"),
+    })
+    @Output({
+            @Param(type = ApiParamType.JSONOBJECT)
+    })
     @Description(desc = "获取工单步骤数据接口")
     @Override
     public Object myDoService(JSONObject jsonObj) throws Exception {
-        ProcessTaskStepDataVo p = jsonObj.toJavaObject(ProcessTaskStepDataVo.class);
-        ProcessTaskStepDataVo processTaskStepDataVo = processTaskStepDataMapper.getProcessTaskStepData(p);
-        if (processTaskStepDataVo != null) {
-            return processTaskStepDataVo.getData();
+        Long id = jsonObj.getLong("id");
+        if (id != null) {
+            ProcessTaskStepDataVo processTaskStepDataVo = processTaskStepDataMapper.getProcessTaskStepDataById(id);
+            if (processTaskStepDataVo != null) {
+                return processTaskStepDataVo.getData();
+            }
+        } else {
+            Long processTaskId = jsonObj.getLong("processTaskId");
+            Long processTaskStepId = jsonObj.getLong("processTaskStepId");
+            String type = jsonObj.getString("type");
+            String fcu = jsonObj.getString("fcu");
+            ProcessTaskStepDataVo searchVo = new ProcessTaskStepDataVo();
+            searchVo.setProcessTaskId(processTaskId);
+            searchVo.setProcessTaskStepId(processTaskStepId);
+            searchVo.setType(type);
+            searchVo.setFcu(fcu);
+            List<ProcessTaskStepDataVo> processTaskStepDataList = processTaskStepDataMapper.searchProcessTaskStepData(searchVo);
+            if (CollectionUtils.isNotEmpty(processTaskStepDataList)) {
+                if (processTaskStepDataList.size() == 1) {
+                    return processTaskStepDataList.get(0).getData();
+                } else {
+                    return TableResultUtil.getResult(processTaskStepDataList);
+                }
+            }
         }
         return null;
     }
diff --git a/src/main/java/neatlogic/module/process/dao/mapper/processtask/ProcessTaskStepDataMapper.java b/src/main/java/neatlogic/module/process/dao/mapper/processtask/ProcessTaskStepDataMapper.java
index b8a30d3f3b9e8866a8b2f6386ac43d4a56ffe98e..1a33d6db7368d6f9bdb22b814eb7bae358310dcd 100644
--- a/src/main/java/neatlogic/module/process/dao/mapper/processtask/ProcessTaskStepDataMapper.java
+++ b/src/main/java/neatlogic/module/process/dao/mapper/processtask/ProcessTaskStepDataMapper.java
@@ -28,6 +28,12 @@ public interface ProcessTaskStepDataMapper extends IProcessTaskStepDataCrossover
 
     ProcessTaskStepDataVo getProcessTaskStepData(ProcessTaskStepDataVo processTaskStepDataVo);
 
+    ProcessTaskStepDataVo getProcessTaskStepDataById(Long id);
+
+    Long getProcessTaskStepDataId(ProcessTaskStepDataVo processTaskStepDataVo);
+
+    int checkProcessTaskStepDataIdIsExists(Long id);
+
 	List<ProcessTaskStepDataVo> searchProcessTaskStepData(ProcessTaskStepDataVo processTaskStepDataVo);
 
     int replaceProcessTaskStepData(ProcessTaskStepDataVo processTaskStepDataVo);
diff --git a/src/main/java/neatlogic/module/process/dao/mapper/processtask/ProcessTaskStepDataMapper.xml b/src/main/java/neatlogic/module/process/dao/mapper/processtask/ProcessTaskStepDataMapper.xml
index e871f8ebc068ab7b4b8cc92763b20adb9e436457..9219ec71d644dc0cfd4e99784f9cd9d9b2eab24a 100644
--- a/src/main/java/neatlogic/module/process/dao/mapper/processtask/ProcessTaskStepDataMapper.xml
+++ b/src/main/java/neatlogic/module/process/dao/mapper/processtask/ProcessTaskStepDataMapper.xml
@@ -60,6 +60,46 @@
         LIMIT 1
     </select>
 
+    <select id="getProcessTaskStepDataById" parameterType="java.lang.Long"
+            resultType="neatlogic.framework.process.dto.ProcessTaskStepDataVo">
+        SELECT
+        `id`,
+        `processtask_id` as processTaskId,
+        `processtask_step_id` as processTaskStepId,
+        `data`,
+        `type`,
+        `fcu`
+        FROM `processtask_step_data`
+        WHERE `id` = #{value}
+    </select>
+
+    <select id="getProcessTaskStepDataId" parameterType="neatlogic.framework.process.dto.ProcessTaskStepDataVo"
+            resultType="java.lang.Long">
+        SELECT
+            `id`
+        FROM `processtask_step_data`
+        <where>
+            <if test="processTaskId != null">
+                AND `processtask_id` = #{processTaskId}
+            </if>
+            <if test="processTaskStepId != null">
+                AND `processtask_step_id` = #{processTaskStepId}
+            </if>
+            <if test="type != null and type != ''">
+                AND `type` = #{type}
+            </if>
+            <if test="fcu != null and fcu != ''">
+                AND `fcu` = #{fcu}
+            </if>
+        </where>
+        ORDER BY `id` DESC
+        LIMIT 1
+    </select>
+
+    <select id="checkProcessTaskStepDataIdIsExists" parameterType="java.lang.Long" resultType="int">
+        SELECT COUNT(1) FROM `processtask_step_data` WHERE `id` = #{value}
+    </select>
+
     <select id="searchProcessTaskStepData" parameterType="neatlogic.framework.process.dto.ProcessTaskStepDataVo"
             resultType="neatlogic.framework.process.dto.ProcessTaskStepDataVo">
         SELECT