From af3268756fbf2e95dc2bd88ddea54c886af72c29 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= <rakor@qq.com>
Date: Mon, 18 Mar 2024 15:24:10 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8E=9F=E5=A7=8Bbom=E6=9A=82=E5=AD=98?=
 =?UTF-8?q?=E3=80=81=E6=8F=90=E4=BA=A4=E3=80=81=E8=BD=ACebom=E6=97=B6?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=9D=83=E9=99=90=E6=A0=A1=E9=AA=8C=EF=BC=8C?=
 =?UTF-8?q?=E5=8F=AA=E5=85=81=E8=AE=B8=E6=93=8D=E4=BD=9C=E8=87=AA=E5=B7=B1?=
 =?UTF-8?q?=E5=88=9B=E5=BB=BA=E7=9A=84=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../nflg/product/bomnew/api/user/OriginalBomApi.java   | 10 +++++-----
 .../bomnew/service/BomNewOriginalParentService.java    |  6 ++++++
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/OriginalBomApi.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/OriginalBomApi.java
index e518fa74..1ddd8ef0 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/OriginalBomApi.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/OriginalBomApi.java
@@ -7,7 +7,6 @@ import com.mzt.logapi.context.LogRecordContext;
 import com.mzt.logapi.starter.annotation.LogRecord;
 import com.nflg.product.base.core.api.BaseApi;
 import com.nflg.product.base.core.conmon.util.SessionUtil;
-import com.nflg.product.base.core.exception.NflgBusinessException;
 import com.nflg.product.bomnew.constant.OriginalStatusEnum;
 import com.nflg.product.bomnew.mapper.master.BomNewEbomChildMapper;
 import com.nflg.product.bomnew.pojo.dto.BomNewOriginalExcelDTO;
@@ -29,11 +28,8 @@ import io.swagger.annotations.ApiOperation;
 import nflg.product.common.constant.STATE;
 import nflg.product.common.vo.ResultVO;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.transaction.support.TransactionSynchronizationAdapter;
-import org.springframework.transaction.support.TransactionSynchronizationManager;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
-import org.ttzero.excel.entity.ListMapSheet;
 import org.ttzero.excel.entity.ListSheet;
 import org.ttzero.excel.entity.Workbook;
 
@@ -44,7 +40,7 @@ import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.List;
-import java.util.Map;
+import java.util.Objects;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ExecutionException;
 
@@ -95,6 +91,8 @@ public class OriginalBomApi extends BaseApi {
         BomNewOriginalParentEntity parentEntity = originalParentService.getBaseMapper().selectById(bom.getParentRowId());
         LogRecordContext.putVariable("drawingNo",parentEntity.getDrawingNo());
 
+        VUtils.isTure(!Objects.equals(parentEntity.getCreatedBy(), SessionUtil.getUserCode())).throwMessage("不能操作非本人创建的数据");
+
         return ResultVO.success(originalParentService.saveBom(bom, false));
     }
 
@@ -106,6 +104,8 @@ public class OriginalBomApi extends BaseApi {
         BomNewOriginalParentEntity parentEntity = originalParentService.getBaseMapper().selectById(bom.getParentRowId());
         LogRecordContext.putVariable("drawingNo",parentEntity.getDrawingNo());
 
+        VUtils.isTure(!Objects.equals(parentEntity.getCreatedBy(), SessionUtil.getUserCode())).throwMessage("不能操作非本人创建的数据");
+
         return ResultVO.success(originalParentService.saveSubmit(bom));
     }
 
diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewOriginalParentService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewOriginalParentService.java
index 0b597021..a6bcc939 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewOriginalParentService.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewOriginalParentService.java
@@ -482,6 +482,12 @@ public class BomNewOriginalParentService extends ServiceImpl<BomNewOriginalParen
 
         //开始转换
         for (BomNewOriginalParentEntity parent : bomNewOriginalParentEntities) {
+
+            if (!Objects.equals(parent.getCreatedBy(), SessionUtil.getUserCode())){
+                log.warn(SessionUtil.getRealName()+"("+SessionUtil.getUserCode()+")转换原始bom("+parent.getRowId().toString()+")到ebom的操作被阻止");
+                continue;
+            }
+
             LogRecordContext.putVariable("bom",parent);
             Long ebomRowId = IdWorker.getId();
             convertToEBomDo(parent, ebomRowId);