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 232fb474f..55a9bfddf 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
@@ -127,8 +127,8 @@ public class MachineController {
     @GetMapping("getMachineTree")
     @Operation(summary = "获得机台树")
     //@PreAuthorize("@ss.hasPermission('machine::query')")
-    public CommonResult<Map<Integer, List<MachineVO>>> getMachineTree(@RequestParam(required = false) Long organId ,@RequestParam(required = false) Long type) {
-        return success(machineService.getMachineTree(organId,type));
+    public CommonResult<Map<Integer, List<MachineVO>>> getMachineTree(@RequestParam(required = false) Long type) {
+        return success(machineService.getMachineTree(type));
     }
 
     @GetMapping(value = {"/list-all-simple", "/simple-list"})
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 644c185d5..8640798d7 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,7 +71,7 @@ public interface MachineService {
 
     List<MachineDO> list(Collection<Long> ids);
 
-    Map<Integer, List<MachineVO>> getMachineTree(Long organId,Long type);
+    Map<Integer, List<MachineVO>> getMachineTree(Long type);
 
     Boolean auth(MachineOrgAuthReq vo);
 
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 5e8b73048..b6722c078 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
@@ -44,6 +44,7 @@ import javax.annotation.Resource;
 
 import static com.cf.imes.framework.common.exception.enums.GlobalErrorCodeConstants.INTERNAL_SERVER_ERROR;
 import static com.cf.imes.framework.common.exception.util.ServiceExceptionUtil.exception;
+import static com.cf.imes.framework.security.core.util.SecurityFrameworkUtils.getUserOrganId;
 import static com.cf.imes.module.system.enums.ErrorCodeConstants.*;
 
 /**
@@ -236,9 +237,9 @@ public class MachineServiceImpl implements MachineService {
     }
 
     @Override
-    public Map<Integer, List<MachineVO>> getMachineTree(Long organId,Long type) {
+    public Map<Integer, List<MachineVO>> getMachineTree(Long type) {
         List<MachineDO> machineDOS = machineMapper.selectList(new LambdaQueryWrapperX<MachineDO>()
-                .eqIfPresent(MachineDO::getOrganId, organId)
+                .eqIfPresent(MachineDO::getOrganId, getUserOrganId())
                 .eqIfPresent(MachineDO::getMachineType, type)
                 .select(MachineDO::getName, MachineDO::getMachineType, MachineDO::getId, MachineDO::getLabelId, MachineDO::getCreateTime)
         );