机台下拉选项接口添加组织id参数

cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/machine/MachineController.java

@@ -4,18 +4,23 @@ import com.cf.imes.framework.common.enums.CommonStatusEnum;
 import com.cf.imes.framework.es.core.valid.CreateGroup;
 import com.cf.imes.framework.es.core.valid.UpdateGroup;
 import com.cf.imes.framework.operatelog.core.annotations.OperateLog;
+import com.cf.imes.framework.organ.core.context.OrganContextHolder;
 import com.cf.imes.module.system.controller.admin.machine.vo.*;
 import com.cf.imes.module.system.dal.dataobject.dept.DeptDO;
 import com.cf.imes.module.system.dal.dataobject.machine.MachineDO;
 import com.cf.imes.module.system.service.machine.MachineService;
 import com.cf.imes.module.system.service.machine.MachineTemplateService;
 import org.springframework.web.bind.annotation.*;
+
 import javax.annotation.Resource;
+
 import org.springframework.validation.annotation.Validated;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.Operation;
+
 import javax.validation.*;
+
 import com.cf.imes.framework.common.pojo.PageResult;
 import com.cf.imes.framework.common.pojo.CommonResult;
 import com.cf.imes.framework.common.util.object.BeanUtils;
@@ -128,8 +133,9 @@ public class MachineController {
 
     @GetMapping(value = {"/list-all-simple", "/simple-list"})
     @Operation(summary = "获取机台精简信息列表", description = "主要用于前端的下拉选项")
-    public CommonResult<List<MachineSimpleRespVO>> getSimpleDeptList() {
+    public CommonResult<List<MachineSimpleRespVO>> getSimpleDeptList(@RequestParam(required = false) Long organId) {
-        List<MachineSimpleRespVO> list = machineService.simpleList();
+        organId = organId == null ? OrganContextHolder.getOrganId() : organId;
+        List<MachineSimpleRespVO> list = machineService.simpleList(organId);
         return success(list);
     }
 

cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/machine/vo/MachineSimpleRespVO.java

@@ -1,10 +1,12 @@
 package com.cf.imes.module.system.controller.admin.machine.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
 
 /**
  * @author Beal
  */
+@Data
 public class MachineSimpleRespVO {
     @Schema(description = "机台id")
     private Long id;

cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/machine/MachineService.java

@@ -81,5 +81,5 @@ public interface MachineService {
 
     PageResult<MachineDO> page(MachinePageReqVO pageParam);
 
-    List<MachineSimpleRespVO> simpleList();
+    List<MachineSimpleRespVO> simpleList(Long organId);
 }

cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/machine/MachineServiceImpl.java

@@ -14,6 +14,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.cf.imes.framework.es.core.dal.ESDocument;
 import com.cf.imes.framework.es.core.service.ESDocumentService;
 import com.cf.imes.framework.mybatis.core.query.LambdaQueryWrapperX;
+import com.cf.imes.framework.organ.core.aop.OrganIgnore;
 import com.cf.imes.framework.security.core.LoginUser;
 import com.cf.imes.framework.security.core.util.SecurityFrameworkUtils;
 import com.cf.imes.module.system.controller.admin.machine.vo.*;
@@ -291,9 +292,11 @@ public class MachineServiceImpl implements MachineService {
     }
 
     @Override
-    public List<MachineSimpleRespVO> simpleList() {
+    @OrganIgnore
+    public List<MachineSimpleRespVO> simpleList(Long organId) {
         List<MachineDO> machineDOS = machineMapper.selectList(new LambdaQueryWrapperX<MachineDO>()
                 .select(MachineDO::getId, MachineDO::getName)
+                .eq(MachineDO::getOrganId, organId)
         );
         return BeanUtils.toBean(machineDOS, MachineSimpleRespVO.class);
     }