From a1e9e10006e49a5a4938c4969f018f2b6c76fef2 Mon Sep 17 00:00:00 2001
From: gaoqr <13665037151@163.com>
Date: Mon, 10 Mar 2025 18:38:59 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9Ewebcad=E7=94=9F=E4=BA=A7?=
 =?UTF-8?q?=E5=8D=95=E5=AF=BC=E5=85=A5=EF=BC=9A=E5=A4=8D=E5=88=B6webcad?=
 =?UTF-8?q?=E4=B8=93=E7=94=A8=E6=8E=A5=E5=8F=A3=EF=BC=8C=E6=97=A0=E9=9C=80?=
 =?UTF-8?q?=E6=9D=83=E9=99=90=E6=A3=80=E6=9F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../manage/controller/admin/plate/PlateController.java |  6 +++---
 .../imes/module/manage/service/plate/PlateService.java | 10 +++++++++-
 .../module/manage/service/plate/PlateServiceImpl.java  | 10 +++++++---
 3 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/plate/PlateController.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/plate/PlateController.java
index 31a1a4f2a..7220214c8 100644
--- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/plate/PlateController.java
+++ b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/plate/PlateController.java
@@ -96,7 +96,7 @@ public class PlateController {
     @GetMapping("/webcad/page")
     @Operation(summary = "webcad获得板材信息分页")
     public CommonResult<PageResult<PlateRespVO>> webCadGetPlatePage(@Valid PlatePageReqVO pageReqVO) {
-        PageResult<PlateDO> pageResult = plateService.getPlatePage(pageReqVO);
+        PageResult<PlateDO> pageResult = plateService.webCadGetPlatePage(pageReqVO);
         return success(BeanUtils.toBean(pageResult, PlateRespVO.class));
     }
 
@@ -174,8 +174,8 @@ public class PlateController {
 
     @GetMapping("/webcad/all")
     @Operation(summary = "获取全部板材信息")
-    public CommonResult<List<PlateRespVO>> webCadGetPlateAll(@RequestParam("organId") Long organId) {
-        List<PlateDO> list = plateService.getPlateAll(organId);
+    public CommonResult<List<PlateRespVO>> webCadGetPlateAll() {
+        List<PlateDO> list = plateService.getPlateAll();
         return success(BeanUtils.toBean(list, PlateRespVO.class));
     }
 
diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/plate/PlateService.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/plate/PlateService.java
index 7976aaa39..167b1d28c 100644
--- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/plate/PlateService.java
+++ b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/plate/PlateService.java
@@ -67,6 +67,14 @@ public interface PlateService {
      */
     PageResult<PlateDO> getPlatePage(PlatePageReqVO pageReqVO);
 
+    /**
+     * webcad获取板材信息表 plate_{N}分页
+     *
+     * @param pageReqVO 分页查询
+     * @return 板材信息表 plate_{N}分页
+     */
+    PageResult<PlateDO> webCadGetPlatePage(PlatePageReqVO pageReqVO);
+
     /**
      * 批量导入板材
      *
@@ -89,5 +97,5 @@ public interface PlateService {
 
     }
 
-    List<PlateDO> getPlateAll(Long organId);
+    List<PlateDO> getPlateAll();
 }
\ No newline at end of file
diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/plate/PlateServiceImpl.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/plate/PlateServiceImpl.java
index 69196fc16..b7151d488 100644
--- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/plate/PlateServiceImpl.java
+++ b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/plate/PlateServiceImpl.java
@@ -130,6 +130,11 @@ public class PlateServiceImpl implements PlateService {
         return plateMapper.selectPage(pageReqVO);
     }
 
+    @Override
+    public PageResult<PlateDO> webCadGetPlatePage(PlatePageReqVO pageReqVO) {
+        return plateMapper.selectPage(pageReqVO);
+    }
+
 
     @Override
     @OrganIgnore
@@ -183,9 +188,8 @@ public class PlateServiceImpl implements PlateService {
     }
 
     @Override
-    public List<PlateDO> getPlateAll(Long organId) {
-        organId = getOrganId(BASE_PLATE_QUERY_PERMISSION, getLoginUser().getId(), organId);
-        return plateMapper.getAllByOrganId( organId);
+    public List<PlateDO> getPlateAll() {
+        return plateMapper.getAllByOrganId(OrganContextHolder.getOrganId());
     }
 
     private void validateOrganExists(Long organId) {