diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/machine/MachineController.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/machine/MachineController.java
index cde20529d..25ddd04ca 100644
--- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/machine/MachineController.java
+++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/machine/MachineController.java
@@ -120,8 +120,8 @@ public class MachineController {
     @GetMapping("getMachineTree")
     @Operation(summary = "获得机台树")
     @PreAuthorize("@ss.hasPermission('machine::query')")
-    public CommonResult<Map<Integer, List<MachineVO>>> getMachineTree() {
-        return success(machineService.getMachineTree());
+    public CommonResult<Map<Integer, List<MachineVO>>> getMachineTree(@RequestParam(required = false) Long organId) {
+        return success(machineService.getMachineTree(organId));
     }
 
 
diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/machine/MachineService.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/machine/MachineService.java
index 5d1b5efa5..cc2afab47 100644
--- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/machine/MachineService.java
+++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/machine/MachineService.java
@@ -71,5 +71,5 @@ public interface MachineService {
 
     List<MachineDO> list(Collection<Long> ids);
 
-    Map<Integer, List<MachineVO>> getMachineTree();
+    Map<Integer, List<MachineVO>> getMachineTree(Long organId);
 }
\ No newline at end of file
diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/machine/MachineServiceImpl.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/machine/MachineServiceImpl.java
index 3d24fe765..ee78b943d 100644
--- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/machine/MachineServiceImpl.java
+++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/machine/MachineServiceImpl.java
@@ -196,8 +196,9 @@ public class MachineServiceImpl implements MachineService {
     }
 
     @Override
-    public Map<Integer, List<MachineVO>> getMachineTree() {
+    public Map<Integer, List<MachineVO>> getMachineTree(Long organId) {
         List<MachineDO> machineDOS = machineMapper.selectList(new LambdaQueryWrapperX<MachineDO>()
+                        .eqIfPresent(MachineDO::getOrganId, organId)
                 .select(MachineDO::getName, MachineDO::getMachineType, MachineDO::getId, MachineDO::getLabelId, MachineDO::getCreateTime)
         );
         List<MachineVO> machineVOS = BeanUtils.toBean(machineDOS, MachineVO.class);