diff --git a/xhpc-modules/xhpc-workorder/src/main/java/com/xhpc/workorder/controller/WorkStationController.java b/xhpc-modules/xhpc-workorder/src/main/java/com/xhpc/workorder/controller/WorkStationController.java
index aaf2cbe7..3c5fc375 100644
--- a/xhpc-modules/xhpc-workorder/src/main/java/com/xhpc/workorder/controller/WorkStationController.java
+++ b/xhpc-modules/xhpc-workorder/src/main/java/com/xhpc/workorder/controller/WorkStationController.java
@@ -38,6 +38,17 @@ public class WorkStationController extends BaseController {
     }
 
 
+    @GetMapping("/getStationPage")
+    public TableDataInfo getStationList(String tenantId){
+        startPage();
+        Map<String, Object> params = new HashMap<>();
+        params.put("tenantId", tenantId);
+        params.put("delFlag", 0);
+
+        return getDataTable(stationService.getStationList(params));
+    }
+
+
     @GetMapping("/getTree")
     public TableDataInfo getTree(String stationName,
                                  String terminalName){
diff --git a/xhpc-modules/xhpc-workorder/src/main/java/com/xhpc/workorder/mapper/XhpcWorkStationMapper.java b/xhpc-modules/xhpc-workorder/src/main/java/com/xhpc/workorder/mapper/XhpcWorkStationMapper.java
index 06aa31d4..5550e166 100644
--- a/xhpc-modules/xhpc-workorder/src/main/java/com/xhpc/workorder/mapper/XhpcWorkStationMapper.java
+++ b/xhpc-modules/xhpc-workorder/src/main/java/com/xhpc/workorder/mapper/XhpcWorkStationMapper.java
@@ -3,8 +3,13 @@ package com.xhpc.workorder.mapper;
 import com.xhpc.workorder.domain.XhpcWorkStationDomain;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+import java.util.Map;
+
 public interface XhpcWorkStationMapper {
 
+    List<XhpcWorkStationDomain> selectListByParams(@Param("params") Map params);
+
     XhpcWorkStationDomain selectByName(@Param("stationName") String stationName);
 
     int deleteByPrimaryKey(Long workStationId);
diff --git a/xhpc-modules/xhpc-workorder/src/main/java/com/xhpc/workorder/service/WorkStationService.java b/xhpc-modules/xhpc-workorder/src/main/java/com/xhpc/workorder/service/WorkStationService.java
index 4cdce7aa..cbd67304 100644
--- a/xhpc-modules/xhpc-workorder/src/main/java/com/xhpc/workorder/service/WorkStationService.java
+++ b/xhpc-modules/xhpc-workorder/src/main/java/com/xhpc/workorder/service/WorkStationService.java
@@ -1,6 +1,7 @@
 package com.xhpc.workorder.service;
 
 import com.xhpc.workorder.domain.XhpcStationDeviceDomain;
+import com.xhpc.workorder.domain.XhpcWorkStationDomain;
 
 import java.util.List;
 import java.util.Map;
@@ -11,6 +12,9 @@ public interface WorkStationService {
     List<Map<String, Object>> getStationDevice(Map<String, Object> params);
 
 
+    List<XhpcWorkStationDomain> getStationList(Map<String, Object> params);
+
+
     List<Map<String, Object>> getStationDeviceTree(Map<String, Object> params);
 
     String importDevice(List<XhpcStationDeviceDomain> deviceDomainList, Boolean updateSupport);
diff --git a/xhpc-modules/xhpc-workorder/src/main/java/com/xhpc/workorder/service/impl/WorkStationServiceImpl.java b/xhpc-modules/xhpc-workorder/src/main/java/com/xhpc/workorder/service/impl/WorkStationServiceImpl.java
index 01bab7e2..f475aec0 100644
--- a/xhpc-modules/xhpc-workorder/src/main/java/com/xhpc/workorder/service/impl/WorkStationServiceImpl.java
+++ b/xhpc-modules/xhpc-workorder/src/main/java/com/xhpc/workorder/service/impl/WorkStationServiceImpl.java
@@ -29,6 +29,13 @@ public class WorkStationServiceImpl implements WorkStationService {
         return deviceMapper.selectStationGunDeviceListByParams(params);
     }
 
+
+    @Override
+    public List<XhpcWorkStationDomain> getStationList(Map<String, Object> params){
+        return stationMapper.selectListByParams(params);
+    }
+
+
     @Override
     public List<Map<String, Object>> getStationDeviceTree(Map<String, Object> params){
 
diff --git a/xhpc-modules/xhpc-workorder/src/main/resources/mapper/XhpcWorkStationMapper.xml b/xhpc-modules/xhpc-workorder/src/main/resources/mapper/XhpcWorkStationMapper.xml
index e3acb4fd..f6602e82 100644
--- a/xhpc-modules/xhpc-workorder/src/main/resources/mapper/XhpcWorkStationMapper.xml
+++ b/xhpc-modules/xhpc-workorder/src/main/resources/mapper/XhpcWorkStationMapper.xml
@@ -38,6 +38,27 @@
     park_nums, tenant_id
   </sql>
 
+  <select id="selectListByParams">
+    select
+    <include refid="Base_Column_List" />
+    from xhpc_work_station
+    <where>
+      <if test="params.name != null and params.name !=''">
+        and name like concat('%', #{params.name}, '%')
+      </if>
+      <if test="params.tenantId!=null and params.tenantId!=''">
+        and tenant_id = #{params.tenantId}
+      </if>
+        <if test="params.status != null">
+          and status=#{params.status}
+        </if>
+        <if test="params.delFlag!=null">
+          and del_flag=#{params.delFlag}
+        </if>
+    </where>
+
+  </select>
+
 
   <select id="selectByName" resultType="com.xhpc.workorder.domain.XhpcWorkStationDomain">
     select