From 4f86a44420a5d903266154dfc1bb11665e5e24d9 Mon Sep 17 00:00:00 2001
From: jing's <tan_jing_song@126.com>
Date: Thu, 20 Jun 2024 15:43:48 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=A8=A1=E5=9E=8Bdept=5Frow?=
 =?UTF-8?q?=5Fid?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/nflg/product/bomnew/pojo/vo/BomNewEbomParentVO.java  | 4 ++++
 .../nflg/product/bomnew/service/BomNewEbomParentService.java | 3 ++-
 .../nflg/product/bomnew/service/domain/EBom/EBomEdit.java    | 5 ++++-
 .../main/resources/mapper/master/BomNewEbomParentMapper.xml  | 2 ++
 4 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/BomNewEbomParentVO.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/BomNewEbomParentVO.java
index 389e97cb..ad1542b0 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/BomNewEbomParentVO.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/BomNewEbomParentVO.java
@@ -272,6 +272,10 @@ public class BomNewEbomParentVO extends BaseMaterialVO implements Serializable {
      */
     @ApiModelProperty(value = "设计维护部门名称")
     private String deptName;
+    @ApiModelProperty(value = "创建人所属部门rowId")
+    private Long deptRowId;
+
+
 
     /**
      * bom树的高度
diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomParentService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomParentService.java
index 31c798ed..3d9f8529 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomParentService.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomParentService.java
@@ -1963,7 +1963,8 @@ public class BomNewEbomParentService extends ServiceImpl<BomNewEbomParentMapper,
 
             eBomEdit.nextVersion();
 
-            this.saveOrUpdate(eBomEdit.getParentEntity());
+             this.saveOrUpdate(eBomEdit.getParentEntity());
+
         }
 
         if (CollUtil.isNotEmpty(eBomEdit.childEntities)) {
diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomEdit.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomEdit.java
index 636413cc..eb54c497 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomEdit.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomEdit.java
@@ -72,6 +72,7 @@ public class EBomEdit {
         parent.setCurrentVersion("A00");
         parent.setDeviseName(SessionUtil.getRealName());
         parent.setDeptName(SessionUtil.getDepartName());
+        parent.setDeptRowId(SessionUtil.getDepartRowId());
         parent.setSourceRowId("");
         parent.setSource(source);
         parent.setStatus(EBomStatusEnum.WAIT_CHECK.getValue());
@@ -352,8 +353,10 @@ public class EBomEdit {
         if (dto.getParent().getBomRowId() == null || dto.getParent().getBomRowId().longValue() == 0) {
 
            checkHadBom(dto.getParent().getMaterialNo());
-            dto.getParent().setBomRowId(dto.getParent().getRowId());
+
             parentEntity = createParentBomInfo(dto.getParent());
+          //  dto.getParent().setBomRowId(dto.getParent().getRowId());
+
             dto.getDatas().forEach(k -> {
                 k.setParentRowId(parentEntity.getRowId());
             });
diff --git a/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewEbomParentMapper.xml b/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewEbomParentMapper.xml
index 745f6b03..6baa5d24 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewEbomParentMapper.xml
+++ b/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewEbomParentMapper.xml
@@ -48,6 +48,8 @@
         <result column="convert_to_ebom_time" property="convertToEbomTime" jdbcType="TIMESTAMP"/>
         <result column="remark" property="remark" jdbcType="VARCHAR"/>
         <result column="dept_name" property="deptName" jdbcType="VARCHAR"/>
+        <result column="dept_row_id" property="deptRowId" jdbcType="BIGINT"/>
+
         <result column="level_num" property="levelNum" jdbcType="INTEGER"/>
         <result column="change_desc" property="changeDesc" jdbcType="VARCHAR"/>
         <result column="notice_nums" property="noticeNums" jdbcType="VARCHAR"/>