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 fac3a426..ead31294 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,7 +38,7 @@ public class WorkStationController extends BaseController {
 
     @GetMapping("/getPage")
     public TableDataInfo getPage(HttpServletRequest request, String stationName,
-                                 String terminalName) {
+                                 String terminalName,String  stationId) {
 
         startPage();
         LoginUser logUser = logUserUtils.getLogUser(request);
@@ -47,7 +47,7 @@ public class WorkStationController extends BaseController {
         params.put("stationName", stationName);
         params.put("terminalName", terminalName);
         params.put("tenantId", logUser.getTenantId());
-
+        params.put("stationId", stationId);
         return getDataTable(stationService.getStationDevice(params));
     }
 
@@ -122,7 +122,6 @@ public class WorkStationController extends BaseController {
         return R.ok(stationService.getDeviceDetail(deviceId));
     }
 
-
     @Log(title = "场站设备-新增设备", businessType = BusinessType.INSERT)
     @PostMapping("/")
     public R insertNewDevice(HttpServletRequest request, @RequestBody XhpcStationDeviceDomain domain) throws Exception {
diff --git a/xhpc-modules/xhpc-workorder/src/main/resources/mapper/XhpcStationDeviceMapper.xml b/xhpc-modules/xhpc-workorder/src/main/resources/mapper/XhpcStationDeviceMapper.xml
index 754ea873..1344c51a 100644
--- a/xhpc-modules/xhpc-workorder/src/main/resources/mapper/XhpcStationDeviceMapper.xml
+++ b/xhpc-modules/xhpc-workorder/src/main/resources/mapper/XhpcStationDeviceMapper.xml
@@ -46,6 +46,7 @@
     d2.brand_model as 'gunBrandModel',
     d2.current_type as 'gunCurrentType',
     d2.sorted as 'gunSorted',
+    t.terminal_id as 'terminalId',
     t.status as 'status',
     t.work_status as 'workStatus',
     t.charging_pile_id as 'chargingPileId'