From af59e4d830876672b608178d275775c617392235 Mon Sep 17 00:00:00 2001
From: lym <1994302445@qq.com>
Date: Fri, 19 Apr 2024 18:27:55 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9D=BF=E6=9D=90=E6=8E=A5=E5=8F=A3=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../admin/plate/PlateController.java          | 10 ++++++---
 .../manage/service/plate/PlateService.java    |  2 +-
 .../service/plate/PlateServiceImpl.java       | 22 +++++++++++++------
 3 files changed, 23 insertions(+), 11 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 1e2397470..5d9bbb02c 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
@@ -59,10 +59,14 @@ public class PlateController {
 
     @DeleteMapping("/delete")
     @Operation(summary = "删除板材信息表 plate_{N}")
-    @Parameter(name = "id", description = "编号", required = true)
+    @Parameters({
+            @Parameter(name = "id", description = "编号", required = true),
+            @Parameter(name = "organId", description = "板材所属组织ID")
+    })
     @PreAuthorize("@ss.hasPermission('manage:plate:delete')")
-    public CommonResult<Boolean> deletePlate(@RequestParam("id") Long id) {
-        plateService.deletePlate(id);
+    public CommonResult<Boolean> deletePlate(@RequestParam("id") Long id,
+                                             @RequestParam(value = "organId",required = false) Long organId) {
+        plateService.deletePlate(id,organId);
         return success(true);
     }
 
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 6edd09a0c..a2d34a894 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
@@ -38,7 +38,7 @@ public interface PlateService {
      *
      * @param id 编号
      */
-    void deletePlate(Long id);
+    void deletePlate(Long id,Long organId);
 
     /**
      * 获得板材信息表 plate_{N}
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 b55d1b9b8..bb008ab9c 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
@@ -58,23 +58,31 @@ public class PlateServiceImpl implements PlateService {
 
     @Override
     public void updatePlate(PlateSaveReqVO updateReqVO) {
-        // 校验存在
-        validatePlateExists(updateReqVO.getId());
         // 更新 判断是否有组织id
+        if (updateReqVO.getOrganId() == null || updateReqVO.getOrganId() == 0){
+            updateReqVO.setOrganId(OrganContextHolder.getOrganId());
+        }else {
+            validateOrganExists(updateReqVO.getOrganId());
+        }
+        // 校验存在
+        validatePlateExists(updateReqVO.getId(), updateReqVO.getOrganId());
         PlateDO updateObj = BeanUtils.toBean(updateReqVO, PlateDO.class);
         plateMapper.updateById(updateObj);
     }
 
     @Override
-    public void deletePlate(Long id) {
+    public void deletePlate(Long id,Long organId) {
+        if (organId == null || organId == 0){
+            organId = OrganContextHolder.getOrganId();
+        }
         // 校验存在
-        validatePlateExists(id);
+        validatePlateExists(id,organId);
         // 删除
         plateMapper.deleteById(id);
     }
 
-    private void validatePlateExists(Long id) {
-        if (plateMapper.selectById(id) == null) {
+    private void validatePlateExists(Long id,Long organId) {
+        if (plateMapper.selectOneById(id,organId) == null) {
             throw exception(PLATE_NOT_EXISTS);
         }
     }
@@ -139,7 +147,7 @@ public class PlateServiceImpl implements PlateService {
         }
     }
 
-//    当前组织中板材是否存在
+    //    当前组织中板材是否存在
     private void validateGoodExists(String goodsId ,Long organId) {
         if (plateMapper.selectByGoodID(goodsId ,organId) != null){
             throw exception(ErrorCodeConstants.PLATE_EXISTS);