diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/PublicController.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/PublicController.java
index 4534c3e..c65f86a 100644
--- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/PublicController.java
+++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/PublicController.java
@@ -227,4 +227,15 @@ public class PublicController extends BaseController {
         List<Gsp> list = gspService.queryList(form);
         return getDataTable(list);
     }
+
+    /**
+     * 获取模板的步骤库列表
+     * @param templateId
+     * @return
+     */
+    @GetMapping("/templateStepList")
+    public AjaxResult templateStepList(Long templateId,String templateSn)
+    {
+        return AjaxResult.success(templateService.getStepListByTemplateId(templateId,templateSn));
+    }
 }
diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/StepGroupController.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/StepGroupController.java
index 8b4d0af..3b3fdb1 100644
--- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/StepGroupController.java
+++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/StepGroupController.java
@@ -3,6 +3,7 @@ package com.hxhq.business.controller;
 import java.util.Arrays;
 import java.util.List;
 
+import com.hxhq.common.security.annotation.Logical;
 import com.hxhq.common.security.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -30,7 +31,7 @@ public class StepGroupController extends BaseController
      * 查询步骤库列表
      */
     @GetMapping("/list")
-    @RequiresPermissions("business:stepGroup:list")
+    @RequiresPermissions(value = {"business:stepGroup:list","business:template:list"},logical = Logical.OR)
     public TableDataInfo list(StepGroup stepGroup)
     {
         startPage();
diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/mapper/TemplateMapper.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/mapper/TemplateMapper.java
index 453f8ae..f67a942 100644
--- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/mapper/TemplateMapper.java
+++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/mapper/TemplateMapper.java
@@ -1,6 +1,7 @@
 package com.hxhq.business.mapper;
 
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.hxhq.business.domain.Step;
 import com.hxhq.business.domain.Template;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
@@ -21,4 +22,11 @@ public interface TemplateMapper extends BaseMapper<Template>
      * @return
      */
     List<Template> queryList(@Param("ew") Wrapper<Template> queryWrapper);
+
+    /**
+     * 根据步骤库ids获取步骤列表
+     * @param stepGroupIds
+     * @return
+     */
+    List<Step> getStepListByTemplateStepGroupIds(String stepGroupIds);
 }
diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/ITemplateService.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/ITemplateService.java
index b60d014..3659cf7 100644
--- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/ITemplateService.java
+++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/ITemplateService.java
@@ -1,6 +1,8 @@
 package com.hxhq.business.service;
 
 import java.util.List;
+
+import com.hxhq.business.domain.Step;
 import com.hxhq.business.domain.Template;
 import com.baomidou.mybatisplus.extension.service.IService;
 
@@ -20,4 +22,12 @@ public interface ITemplateService extends IService<Template>
      */
     public List<Template> queryList(Template template);
 
+    /**
+     * 获取模板的步骤库
+     * @param templateId
+     * @param templateSn
+     * @return
+     */
+    List<Step> getStepListByTemplateId(Long templateId,String templateSn);
+
 }
diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/TemplateServiceImpl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/TemplateServiceImpl.java
index 5a9ad0c..10ee9f7 100644
--- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/TemplateServiceImpl.java
+++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/TemplateServiceImpl.java
@@ -1,9 +1,13 @@
 package com.hxhq.business.service.impl;
 
+import java.util.ArrayList;
 import java.util.List;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.hxhq.business.domain.Step;
+import com.hxhq.common.core.exception.ServiceException;
 import com.hxhq.common.core.utils.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.hxhq.business.mapper.TemplateMapper;
 import com.hxhq.business.domain.Template;
@@ -45,8 +49,26 @@ public class TemplateServiceImpl extends ServiceImpl<TemplateMapper, Template> i
         if(template.getStatus()!=null && template.getStatus().intValue()>0){
             queryWrapper.eq("t.status",template.getStatus());
         }
-        queryWrapper.orderByDesc("t.id");
+        queryWrapper.orderByAsc("t.id");
         return baseMapper.queryList(queryWrapper);
     }
 
+    @Override
+    public List<Step> getStepListByTemplateId(Long templateId,String templateSn) {
+        Template template = null;
+        if(templateId!=null && templateId.longValue()>0){
+            template = getById(templateId);
+        }else{
+            QueryWrapper<Template> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("sn",templateSn);
+            template = getOne(queryWrapper,false);
+        }
+        if(template==null){
+            throw new ServiceException("模板不存在");
+        }
+        if(StringUtils.isBlank(template.getStepGroupIds())){
+            return new ArrayList<>();
+        }
+        return baseMapper.getStepListByTemplateStepGroupIds(template.getStepGroupIds());
+    }
 }
diff --git a/hxhq-modules/hxhq-system/src/main/resources/mapper/business/TemplateMapper.xml b/hxhq-modules/hxhq-system/src/main/resources/mapper/business/TemplateMapper.xml
index db24bb8..0cde614 100644
--- a/hxhq-modules/hxhq-system/src/main/resources/mapper/business/TemplateMapper.xml
+++ b/hxhq-modules/hxhq-system/src/main/resources/mapper/business/TemplateMapper.xml
@@ -13,4 +13,12 @@
             </where>
         </if>
     </select>
+
+    <select id="getStepListByTemplateStepGroupIds" resultType="com.hxhq.business.domain.Step">
+        SELECT DISTINCT id,`name` FROM `t_step`
+        WHERE del_flag='0' AND
+        FIND_IN_SET(id,
+            (SELECT GROUP_CONCAT(step_ids) FROM `t_step_group` WHERE del_flag='0' AND FIND_IN_SET(id,#{stepGroupIds}))
+        )
+    </select>
 </mapper>
\ No newline at end of file