1.修复从CAD 获取

nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/mapper/master/BomNewOriginalChildMapper.java

@@ -40,4 +40,6 @@ public interface BomNewOriginalChildMapper extends BaseMapper<BomNewOriginalChil
      * @param rowIds
      */
     void syncOriginalBomToFormal(@Param("rowIds") List<Long> rowIds);
+
+    void  deleteChildByParentRowIds(@Param("parentRowIds") List<Long> parentRowIds);
 }

nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/entity/BomOriginalCadChildEntity.java

@@ -101,9 +101,9 @@ public class BomOriginalCadChildEntity implements Serializable {
     /**
      * 项目类别
      */
-    @TableField(value = "projectType")
+    @TableField(value = "project_type")
     @ApiModelProperty(value = "项目类别")
-    private String project_type;
+    private String projectType;
 
     /**
      *

nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/OriginalBom/PlmBomToOriginalConvertV2.java

@@ -99,7 +99,7 @@ public class PlmBomToOriginalConvertV2 extends BaseConvert {
         originalParentService.getBaseMapper().deleteByMap(ImmutableMap.of("drawing_no", parent.getChartNo()));
         List<Long> oldParentRowIds = oldOriginalParents.stream().map(u -> u.getRowId()).collect(Collectors.toList());
         if (CollUtil.isNotEmpty(oldParentRowIds)) {
-            originalChildService.getBaseMapper().deleteByMap(ImmutableMap.of("parent_row_id", oldOriginalParents));
+            originalChildService.getBaseMapper().deleteChildByParentRowIds(oldParentRowIds);
         }
         //有子级(原始BOM-直接覆盖)
         if (CollUtil.isNotEmpty(childs)) {

nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewOriginalChildMapper.xml

@@ -86,4 +86,11 @@
             #{rowId}
         </foreach>;
     </insert>
+
+    <delete id="deleteChildByParentRowIds">
+        delete from t_bom_new_original_child where parent_row_id in
+            <foreach collection="parentRowIds" item="rowId" open="(" separator="," close=")">
+                #{rowId}
+            </foreach>
+    </delete>
 </mapper>

nflg_project_dev/nflg-boot-base/nflg-boot-core/src/main/java/com/nflg/product/base/core/conmon/util/SessionUtil.java

@@ -33,7 +33,7 @@ public class SessionUtil {
      */
     public static String getUserCode() {
         //return Optional.ofNullable(loginUser.get()).map(LoginUserInfoDTO::getUserCode).orElse("QHI17062100");
-        return getUser().getUserCode();
+        return "NFLG20231201";
 
     }