From 92b21519bcfacea94e95cf7706f668c1b7b80634 Mon Sep 17 00:00:00 2001
From: mashuai <ma_shuai0327@163.com>
Date: Tue, 23 Sep 2025 16:13:11 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../basic/service/impl/BmProjectCombineServiceImpl.java       | 4 ++++
 .../mapper/material/basic/BmProjectCombineMapper.xml          | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/impl/BmProjectCombineServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/impl/BmProjectCombineServiceImpl.java
index 5b0155b2..676e7230 100644
--- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/impl/BmProjectCombineServiceImpl.java
+++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/impl/BmProjectCombineServiceImpl.java
@@ -61,6 +61,7 @@ public class BmProjectCombineServiceImpl implements IBmProjectCombineService
         List<BmProjectCombine> baiList = projectMapper.selectCLAIList(oldProject);
         if (CollectionUtils.isNotEmpty(baiList)) {
             for (BmProjectCombine bai : baiList){
+                bai.setNewProId(oldProject.getNewProId());
                 projectMapper.updateCLAI(bai);
                 bai.setCreateBy(createBy);
                 bai.setTableName("clz_lease_apply_info");
@@ -75,6 +76,7 @@ public class BmProjectCombineServiceImpl implements IBmProjectCombineService
         List<BmProjectCombine> baiList = projectMapper.selectLAIList(oldProject);
         if (CollectionUtils.isNotEmpty(baiList)) {
             for (BmProjectCombine bai : baiList){
+                bai.setNewProId(oldProject.getNewProId());
                 projectMapper.updateLAI(bai);
                 bai.setCreateBy(createBy);
                 bai.setTableName("lease_apply_info");
@@ -89,6 +91,7 @@ public class BmProjectCombineServiceImpl implements IBmProjectCombineService
         List<BmProjectCombine> baiList = projectMapper.selectCBAIList(oldProject);
         if (CollectionUtils.isNotEmpty(baiList)) {
             for (BmProjectCombine bai : baiList){
+                bai.setNewProId(oldProject.getNewProId());
                 projectMapper.updateCBAI(bai);
                 bai.setCreateBy(createBy);
                 bai.setTableName("clz_bm_agreement_info");
@@ -103,6 +106,7 @@ public class BmProjectCombineServiceImpl implements IBmProjectCombineService
         List<BmProjectCombine> baiList = projectMapper.selectBAIList(oldProject);
         if (CollectionUtils.isNotEmpty(baiList)) {
           for (BmProjectCombine bai : baiList){
+              bai.setNewProId(oldProject.getNewProId());
               projectMapper.updateBAI(bai);
               bai.setCreateBy(createBy);
               bai.setTableName("bm_agreement_info");
diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/BmProjectCombineMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/BmProjectCombineMapper.xml
index c2ee3da9..68122a81 100644
--- a/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/BmProjectCombineMapper.xml
+++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/BmProjectCombineMapper.xml
@@ -38,8 +38,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <insert id="insertCombine">
         insert into sys_combine_project
         <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="tableName != null">tabel_name,</if>
-            <if test="tableId != null and tableId != ''">tabel_id,</if>
+            <if test="tableName != null">table_name,</if>
+            <if test="tableId != null and tableId != ''">table_id,</if>
             <if test="oldProId != null">pre_pro_id,</if>
             <if test="newProId != null">new_pro_id,</if>
             <if test="createBy != null">create_by,</if>