From 208bd42db772442b9f9cbfbdb6ef0b1cb1b02114 Mon Sep 17 00:00:00 2001 From: liuzhaotian Date: Wed, 19 Jun 2024 10:29:30 +0800 Subject: [PATCH] =?UTF-8?q?=E8=8E=B7=E5=BE=97=E6=9C=BA=E5=8F=B0=E6=A0=91Bu?= =?UTF-8?q?g=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/controller/admin/machine/MachineController.java | 4 ++-- .../imes/module/system/service/machine/MachineService.java | 2 +- .../module/system/service/machine/MachineServiceImpl.java | 5 +++-- 3 files changed, 6 insertions(+), 5 deletions(-) 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>> getMachineTree(@RequestParam(required = false) Long organId ,@RequestParam(required = false) Long type) { - return success(machineService.getMachineTree(organId,type)); + public CommonResult>> 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 list(Collection ids); - Map> getMachineTree(Long organId,Long type); + Map> 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> getMachineTree(Long organId,Long type) { + public Map> getMachineTree(Long type) { List machineDOS = machineMapper.selectList(new LambdaQueryWrapperX() - .eqIfPresent(MachineDO::getOrganId, organId) + .eqIfPresent(MachineDO::getOrganId, getUserOrganId()) .eqIfPresent(MachineDO::getMachineType, type) .select(MachineDO::getName, MachineDO::getMachineType, MachineDO::getId, MachineDO::getLabelId, MachineDO::getCreateTime) );