修复bug

blade-service/blade-manager/src/main/java/org/springblade/manager/mapper/ContractInfoMapper.xml

@@ -227,8 +227,8 @@
         id AS "key",
         partition_code,
         old_id,
-        major_data_type
-<!--        contract_id AS contractIdRelation-->
+        major_data_type,
+        sort
         FROM
         m_wbs_tree_contract
         WHERE
@@ -268,7 +268,8 @@
         d.id AS "value",
         d.id AS "key",
         partition_code,
-        old_id
+        old_id,
+        sort
         FROM m_wbs_tree_contract d
         WHERE
         d.is_deleted = 0

blade-service/blade-manager/src/main/java/org/springblade/manager/mapper/WbsTreeContractMapper.java

@@ -23,39 +23,21 @@ public interface WbsTreeContractMapper extends BaseMapper<WbsTreeContract> {
 
     List<WbsTreeContractVO> selectAll();
 
-    void deleteBatch(@Param("ids") List<Long> ids,
-                     @Param("wbsId") String wbsId,
-                     @Param("projectId") String projectId,
-                     @Param("contractId") String contractId);
+    void deleteBatch(@Param("ids") List<Long> ids, @Param("wbsId") String wbsId, @Param("projectId") String projectId, @Param("contractId") String contractId);
 
-    WbsTreeContract selectByCondition(@Param("id") String id,
-                                      @Param("projectId") String projectId,
-                                      @Param("contractId") String contractId,
-                                      @Param("wbsId") String wbsId);
+    WbsTreeContract selectByCondition(@Param("id") String id, @Param("projectId") String projectId, @Param("contractId") String contractId, @Param("wbsId") String wbsId);
 
-    List<WbsTreeContract> findAllNodeList2(@Param("projectId") String projectId,
-                                           @Param("contractId") String contractId,
-                                           @Param("wbsId") String wbsId);
+    List<WbsTreeContract> findAllNodeList2(@Param("projectId") String projectId, @Param("contractId") String contractId, @Param("wbsId") String wbsId);
 
-    void updateByCondition(@Param("id") String id,
-                           @Param("projectId") String projectId,
-                           @Param("contractId") String contractId,
-                           @Param("wbsId") String wbsId);
-
-    WbsTreeContract selectByCondition2(@Param("id") String id,
-                                       @Param("projectId") String projectId,
-                                       @Param("contractId") String contractId,
-                                       @Param("wbsId") String wbsId);
+    void updateByCondition(@Param("id") String id, @Param("projectId") String projectId, @Param("contractId") String contractId, @Param("wbsId") String wbsId);
 
+    WbsTreeContract selectByCondition2(@Param("id") String id, @Param("projectId") String projectId, @Param("contractId") String contractId, @Param("wbsId") String wbsId);
 
     WbsTreePrivate selectParent(String projectId, String wbsId, Long parentId);
 
     void updateByCondition1(@Param("wbsTP") WbsTreePrivate wbsTP);
 
-    void insertByCondition(@Param("wbsTree") WbsTreePrivate wbsTreePrivate,
-                           @Param("contractId") Long contractId,
-                           @Param("pKeyId") Long pKeyId,
-                           @Param("wbsType") Integer wbsType);
+    void insertByCondition(@Param("wbsTree") WbsTreePrivate wbsTreePrivate, @Param("contractId") Long contractId, @Param("pKeyId") Long pKeyId, @Param("wbsType") Integer wbsType);
 
     List<WbsTreeContractVO2> selectListByCondition(String projectId);
 
@@ -73,10 +55,7 @@ public interface WbsTreeContractMapper extends BaseMapper<WbsTreeContract> {
 
     List<WbsTableOwnerRole> selectWbsTableOwnerRoleList(String roleId);
 
-    List<WbsTreeContract> selectWbsTreeContractList(List<String> tableOwnerNumbers, String projectId,
-                                                    String wbsId, String contractId,
-                                                    Long parentId, String contractIdRelation,
-                                                    List<String> tableOwnerList);
+    List<WbsTreeContract> selectWbsTreeContractList(List<String> tableOwnerNumbers, String projectId, String wbsId, String contractId, Long parentId, String contractIdRelation, List<String> tableOwnerList);
 
     SaveUserInfoByProject selectRoleInfo(Long userId, String contractId, String projectId);
 
@@ -94,8 +73,8 @@ public interface WbsTreeContractMapper extends BaseMapper<WbsTreeContract> {
 
     List<WbsTreeContract> selectContractList(String wbsId, String projectId,@Param("ids") List<Long> ids);
 
-    void updateBatchByIds(@Param("wbsTreeList") WbsTree wbsTreeList,@Param("id") Long id);
+    void updateBatchByIds(@Param("wbsTree") WbsTree wbsTree,@Param("id") Long id);
 
-    void updateBatchByIds2(@Param("wbsTreeList") WbsTreePrivate wbsTreeList,@Param("id")  Long id);
+    void updateBatchByIds2(@Param("wbsTreePrivate") WbsTreePrivate wbsTreePrivate,@Param("id")  Long id);
 
 }

blade-service/blade-manager/src/main/java/org/springblade/manager/mapper/WbsTreeContractMapper.xml

@@ -152,40 +152,7 @@
     </select>
 
     <select id="selectByCondition" resultType="org.springblade.manager.entity.WbsTreeContract">
-        SELECT id,
-               p_key_id,
-               wbs_id,
-               wbs_type,
-               project_id,
-               contract_id,
-               contract_type,
-               contract_id_relation,
-               tenant_id,
-               parent_id,
-               dept_category,
-               type,
-               dept_name,
-               full_name,
-               table_type,
-               sort,
-               ancestors,
-               remark,
-               unique_code,
-               partition_code,
-               is_expernode,
-               is_concrete,
-               table_owner,
-               major_data_type,
-               init_table_name,
-               is_link_table,
-               create_user,
-               create_dept,
-               create_time,
-               update_user,
-               update_time,
-               STATUS,
-               is_deleted,
-               excel_id
+        SELECT *
         FROM m_wbs_tree_contract
         WHERE id = #{id}
           AND project_id = #{projectId}
@@ -196,40 +163,7 @@
     </select>
 
     <select id="selectByCondition2" resultType="org.springblade.manager.entity.WbsTreeContract">
-        SELECT id,
-               p_key_id,
-               wbs_id,
-               wbs_type,
-               project_id,
-               contract_id,
-               contract_type,
-               contract_id_relation,
-               tenant_id,
-               parent_id,
-               dept_category,
-               type,
-               dept_name,
-               full_name,
-               table_type,
-               sort,
-               ancestors,
-               remark,
-               unique_code,
-               partition_code,
-               is_expernode,
-               is_concrete,
-               table_owner,
-               major_data_type,
-               init_table_name,
-               is_link_table,
-               create_user,
-               create_dept,
-               create_time,
-               update_user,
-               update_time,
-               STATUS,
-               is_deleted,
-               excel_id
+        SELECT *
         FROM m_wbs_tree_contract
         WHERE id = #{id}
           AND project_id = #{projectId}
@@ -239,40 +173,7 @@
     </select>
 
     <select id="findAllNodeList2" resultType="org.springblade.manager.entity.WbsTreeContract">
-        SELECT id,
-               p_key_id,
-               wbs_id,
-               wbs_type,
-               project_id,
-               contract_id,
-               contract_type,
-               contract_id_relation,
-               tenant_id,
-               parent_id,
-               dept_category,
-               type,
-               dept_name,
-               full_name,
-               table_type,
-               sort,
-               ancestors,
-               remark,
-               unique_code,
-               partition_code,
-               is_expernode,
-               is_concrete,
-               table_owner,
-               major_data_type,
-               init_table_name,
-               is_link_table,
-               create_user,
-               create_dept,
-               create_time,
-               update_user,
-               update_time,
-               STATUS,
-               is_deleted,
-               excel_id
+        SELECT *
         FROM m_wbs_tree_contract
         WHERE project_id = #{projectId}
           AND contract_id = #{contractId}
@@ -324,40 +225,7 @@
     </select>
 
     <select id="selectCondition" resultType="org.springblade.manager.entity.WbsTreeContract">
-        SELECT id,
-               p_key_id,
-               wbs_id,
-               wbs_type,
-               project_id,
-               contract_id,
-               contract_type,
-               contract_id_relation,
-               tenant_id,
-               parent_id,
-               dept_category,
-               type,
-               dept_name,
-               full_name,
-               table_type,
-               sort,
-               ancestors,
-               remark,
-               unique_code,
-               partition_code,
-               is_expernode,
-               is_concrete,
-               table_owner,
-               major_data_type,
-               init_table_name,
-               is_link_table,
-               create_user,
-               create_dept,
-               create_time,
-               update_user,
-               update_time,
-               STATUS,
-               is_deleted,
-               excel_id
+        SELECT *
         FROM m_wbs_tree_contract
         WHERE is_deleted = 1
           AND parent_id = 0
@@ -492,7 +360,7 @@
                 #{tableOwnerList}
             </foreach>
         </if>
-        ORDER BY sort , dept_name,create_time
+        ORDER BY sort,dept_name,create_time
     </select>
 
     <select id="selectRoleInfo" resultType="org.springblade.manager.entity.SaveUserInfoByProject">
@@ -572,15 +440,15 @@
 
     <update id="updateBatchByIds">
         UPDATE m_wbs_tree_contract
-        SET dept_name   = #{wbsTreeList.deptName},
-            full_name   =#{wbsTreeList.deptName},
-            dept_category  = #{wbsTreeList.deptCategory},
-            major_data_type = #{wbsTreeList.majorDataType},
-            unique_code = #{wbsTreeList.uniqueCode},
-            partition_code = #{wbsTreeList.partitionCode},
-            table_type = #{wbsTreeList.tableType},
-            table_owner = #{wbsTreeList.tableOwner}
-        WHERE id = #{wbsTreeList.id}
+        SET dept_name = #{wbsTree.deptName},
+            full_name = #{wbsTree.deptName},
+            dept_category = #{wbsTree.deptCategory},
+            major_data_type = #{wbsTree.majorDataType},
+            unique_code = #{wbsTree.uniqueCode},
+            partition_code = #{wbsTree.partitionCode},
+            table_type = #{wbsTree.tableType},
+            table_owner = #{wbsTree.tableOwner}
+        WHERE id = #{wbsTree.id}
           AND contract_id = #{id}
           AND status = 1
           AND is_deleted = 0
@@ -588,15 +456,15 @@
 
     <update id="updateBatchByIds2">
         UPDATE m_wbs_tree_contract
-        SET dept_name   = #{wbsTreeList.deptName},
-            full_name   = #{wbsTreeList.deptName},
-            dept_category  = #{wbsTreeList.deptCategory},
-            major_data_type = #{wbsTreeList.majorDataType},
-            unique_code = #{wbsTreeList.uniqueCode},
-            partition_code = #{wbsTreeList.partitionCode},
-            table_type = #{wbsTreeList.tableType},
-            table_owner = #{wbsTreeList.tableOwner}
-        WHERE id = #{wbsTreeList.id}
+        SET dept_name = #{wbsTreePrivate.deptName},
+            full_name = #{wbsTreePrivate.deptName},
+            dept_category = #{wbsTreePrivate.deptCategory},
+            major_data_type = #{wbsTreePrivate.majorDataType},
+            unique_code = #{wbsTreePrivate.uniqueCode},
+            partition_code = #{wbsTreePrivate.partitionCode},
+            table_type = #{wbsTreePrivate.tableType},
+            table_owner = #{wbsTreePrivate.tableOwner}
+        WHERE id = #{wbsTreePrivate.id}
           AND contract_id = #{id}
           AND status = 1
           AND is_deleted = 0

blade-service/blade-manager/src/main/java/org/springblade/manager/mapper/WbsTreeMapper.xml

@@ -224,7 +224,7 @@
     </update>
 
     <select id="selectWbsTreePage" resultMap="wbsTreeResultMap">
-        select id, wbs_id, tenant_id, parent_id, dept_category , type, dept_name, full_name, table_type, sort , ancestors, remark, unique_code, partition_code, is_expernode , is_concrete, table_owner, major_data_type, init_table_name, project_node_id , is_link_table, is_exist_form, create_user, create_dept, create_time , update_user, update_time, status, is_deleted
+        select *
         from m_wbs_tree where is_deleted = 0
     </select>
 
@@ -277,35 +277,35 @@
 
     <select id="lazyTree" resultMap="treeNodeResultMap">
         SELECT
-        dept.type AS "type",
-        dept.dept_category AS "deptCategory",
-        dept.is_exist_form AS "isExistForm",
-        dept.table_type,
-        dept.id,
-        dept.parent_id,
-        dept.dept_name AS title,
-        dept.id AS "value",
-        dept.id AS "key",
-        dept.ancestors AS "ancestors",
+        t.type AS "type",
+        t.dept_category AS "deptCategory",
+        t.is_exist_form AS "isExistForm",
+        t.table_type,
+        t.id,
+        t.parent_id,
+        t.dept_name AS title,
+        t.id AS "value",
+        t.id AS "key",
+        t.ancestors AS "ancestors",
         (
         SELECT
         CASE WHEN count(1) > 0 THEN 1 ELSE 0 END
         FROM
         m_wbs_tree
         WHERE
-        parent_id = dept.id and is_deleted = 0
+        parent_id = t.id and is_deleted = 0
         ) AS "has_children"
         FROM
-        m_wbs_tree dept
+        m_wbs_tree t
         WHERE
-        dept.parent_id = #{parentId} AND dept.is_deleted = 0
+        t.parent_id = #{parentId} AND t.is_deleted = 0
         <if test="tenantId!=null and tenantId!=''">
-            and dept.tenant_id = #{tenantId}
+            and t.tenant_id = #{tenantId}
         </if>
-        AND dept.wbs_id = #{wbsId}
-        AND dept.type = 1
+        AND t.wbs_id = #{wbsId}
+        AND t.type = 1
         AND status = 1
-        ORDER BY dept.sort
+        ORDER BY t.sort
     </select>
 
     <select id="selectByNodeTable" resultMap="selectByNodeTableMap">
@@ -327,7 +327,7 @@
             wt.type = 2
         AND wt.is_deleted = 0
         AND wt.parent_id = #{id}
-        ORDER BY wt.sort
+        ORDER BY wt.sort,wt.dept_name,wt.create_time
     </select>
 
     <select id="selectByNodeTableByExcel" resultMap="selectByNodeTableMap">
@@ -374,8 +374,7 @@
     </select>
 
     <select id="findAllNodeTableList" resultType="org.springblade.manager.entity.WbsTree">
-        SELECT
-            id, wbs_id, tenant_id, parent_id, dept_category , type, dept_name, full_name, table_type, sort , ancestors, remark, unique_code, partition_code, is_expernode , is_concrete, table_owner, major_data_type, init_table_name, project_node_id , is_link_table, is_exist_form, create_user, create_dept, create_time , update_user, update_time, status, is_deleted
+        SELECT *
         FROM
             m_wbs_tree
         WHERE
@@ -386,8 +385,7 @@
     </select>
 
     <select id="selectIsTable" resultType="org.springblade.manager.entity.WbsTree">
-        SELECT
-            id, wbs_id, tenant_id, parent_id, dept_category , type, dept_name, full_name, table_type, sort , ancestors, remark, unique_code, partition_code, is_expernode , is_concrete, table_owner, major_data_type, init_table_name, project_node_id , is_link_table, is_exist_form, create_user, create_dept, create_time , update_user, update_time, status, is_deleted
+        SELECT *
         FROM
             m_wbs_tree
         WHERE
@@ -398,8 +396,7 @@
     </select>
 
     <select id="selectNodeAndTable" resultType="org.springblade.manager.entity.WbsTree">
-        SELECT
-            id, wbs_id, tenant_id, parent_id, dept_category , type, dept_name, full_name, table_type, sort , ancestors, remark, unique_code, partition_code, is_expernode , is_concrete, table_owner, major_data_type, init_table_name, project_node_id , is_link_table, is_exist_form, create_user, create_dept, create_time , update_user, update_time, status, is_deleted
+        SELECT *
         FROM
             m_wbs_tree
         WHERE
@@ -409,7 +406,7 @@
     </select>
 
     <select id="selectByWbsId" resultType="org.springblade.manager.entity.WbsTree">
-        SELECT id, wbs_id, tenant_id, parent_id, dept_category , type, dept_name, full_name, table_type, sort , ancestors, remark, unique_code, partition_code, is_expernode , is_concrete, table_owner, major_data_type, init_table_name, project_node_id , is_link_table, is_exist_form, create_user, create_dept, create_time , update_user, update_time, status, is_deleted
+        SELECT *
         FROM m_wbs_tree
         WHERE wbs_id = #{id}
         AND status = 1

blade-service/blade-manager/src/main/java/org/springblade/manager/mapper/WbsTreePrivateMapper.java

@@ -5,25 +5,18 @@ import org.apache.ibatis.annotations.Param;
 import org.springblade.manager.dto.WbsTreePrivateDTO2;
 import org.springblade.manager.dto.WbsTreePrivateDTO3;
 import org.springblade.manager.entity.WbsTree;
-import org.springblade.manager.entity.WbsTreeContract;
 import org.springblade.manager.entity.WbsTreePrivate;
 import org.springblade.manager.vo.WbsNodeTableVO;
 import org.springblade.manager.vo.WbsTreePrivateVO;
-import org.springblade.manager.vo.WbsTreeVO;
 
 import java.util.List;
 
 public interface WbsTreePrivateMapper extends BaseMapper<WbsTreePrivate> {
     List<WbsTreePrivate> selectAll(Integer wbsType);
 
-    List<WbsTreePrivateVO> tree(@Param("wbsId") String wbsId,
-                                @Param("projectId") String projectId,
-                                @Param("wbsType") Integer wbsType);
+    List<WbsTreePrivateVO> tree(@Param("wbsId") String wbsId, @Param("projectId") String projectId, @Param("wbsType") Integer wbsType);
 
-
-    List<WbsTreePrivate> selectByCondition(@Param("id") String id,
-                                           @Param("wbsId") String wbsId,
-                                           @Param("projectId") String projectId);
+    List<WbsTreePrivate> selectByCondition(@Param("id") String id, @Param("wbsId") String wbsId, @Param("projectId") String projectId);
 
     void deleteByCondition(String id, String wbsId, String projectId);
 
@@ -33,18 +26,11 @@ public interface WbsTreePrivateMapper extends BaseMapper<WbsTreePrivate> {
 
     void updateByCondition(String id, String projectId, String wbsId);
 
-    void updateTableByCondition(@Param("id") String id,
-                                @Param("projectId") String projectId,
-                                @Param("wbsId") String wbsId);
+    void updateTableByCondition(@Param("id") String id, @Param("projectId") String projectId, @Param("wbsId") String wbsId);
 
-    Integer insertCombination1(@Param("snowId") Long snowId,
-                               @Param("wbsTree") WbsTree wbsTree,
-                               @Param("wbsType") Integer wbsType,
-                               @Param("projectId") String projectId);
+    Integer insertCombination1(@Param("snowId") Long snowId, @Param("wbsTree") WbsTree wbsTree, @Param("wbsType") Integer wbsType, @Param("projectId") String projectId);
 
-    Integer insertCombination2(@Param("snowId") Long snowId,
-                               @Param("wbsTree") WbsTreePrivate wbsTree,
-                               @Param("projectId") String projectId);
+    Integer insertCombination2(@Param("snowId") Long snowId, @Param("wbsTree") WbsTreePrivate wbsTree, @Param("projectId") String projectId);
 
     List<WbsTree> selectIsTable(Long tableId, String projectId);
 
@@ -82,9 +68,8 @@ public interface WbsTreePrivateMapper extends BaseMapper<WbsTreePrivate> {
 
     List<WbsTreePrivate> selectByIds(@Param("projectId") String projectId, @Param("ids") List<String> ids);
 
-    void updateBatchByIds(@Param("wbsTreeList") WbsTree wbsTreeList, @Param("projectId") String projectId);
-
-    void updateBatchByIds2(@Param("wbsTreeList") WbsTreePrivate wbsTreeList,@Param("projectId") String projectId,@Param("wbsId") String wbsId);
+    void updateBatchByIds(@Param("wbsTree") WbsTree wbsTree, @Param("projectId") String projectId);
 
+    void updateBatchByIds2(@Param("wbsTreePrivate") WbsTreePrivate wbsTreePrivate, @Param("projectId") String projectId, @Param("wbsId") String wbsId);
 
 }

blade-service/blade-manager/src/main/java/org/springblade/manager/mapper/WbsTreePrivateMapper.xml

@@ -192,8 +192,8 @@
 
     <update id="updateBatchByPid">
         UPDATE m_wbs_tree_private
-        SET dept_name   = #{wbsTreePrivates.deptName},
-            full_name   =#{wbsTreePrivates.deptName},
+        SET dept_name = #{wbsTreePrivates.deptName},
+            full_name =#{wbsTreePrivates.deptName},
             table_type  = #{wbsTreePrivates.tableType},
             table_owner = #{wbsTreePrivates.tableOwner}
         WHERE p_key_id = #{wbsTreePrivates.pKeyId}
@@ -201,15 +201,15 @@
 
     <update id="updateBatchByIds">
         UPDATE m_wbs_tree_private
-        SET dept_name   = #{wbsTreeList.deptName},
-            full_name   =#{wbsTreeList.deptName},
-            dept_category  = #{wbsTreeList.deptCategory},
-            major_data_type = #{wbsTreeList.majorDataType},
-            unique_code = #{wbsTreeList.uniqueCode},
-            partition_code = #{wbsTreeList.partitionCode},
-            table_type = #{wbsTreeList.tableType},
-            table_owner = #{wbsTreeList.tableOwner}
-        WHERE id = #{wbsTreeList.id}
+        SET dept_name = #{wbsTree.deptName},
+            full_name =#{wbsTree.deptName},
+            dept_category = #{wbsTree.deptCategory},
+            major_data_type = #{wbsTree.majorDataType},
+            unique_code = #{wbsTree.uniqueCode},
+            partition_code = #{wbsTree.partitionCode},
+            table_type = #{wbsTree.tableType},
+            table_owner = #{wbsTree.tableOwner}
+        WHERE id = #{wbsTree.id}
         AND project_id = #{projectId}
         AND status = 1
         AND is_deleted = 0
@@ -217,15 +217,15 @@
 
     <update id="updateBatchByIds2">
         UPDATE m_wbs_tree_private
-        SET dept_name   = #{wbsTreeList.deptName},
-            full_name   = #{wbsTreeList.deptName},
-            dept_category  = #{wbsTreeList.deptCategory},
-            major_data_type = #{wbsTreeList.majorDataType},
-            unique_code = #{wbsTreeList.uniqueCode},
-            partition_code = #{wbsTreeList.partitionCode},
-            table_type = #{wbsTreeList.tableType},
-            table_owner = #{wbsTreeList.tableOwner}
-        WHERE id = #{wbsTreeList.id}
+        SET dept_name = #{wbsTreePrivate.deptName},
+            full_name = #{wbsTreePrivate.deptName},
+            dept_category = #{wbsTreePrivate.deptCategory},
+            major_data_type = #{wbsTreePrivate.majorDataType},
+            unique_code = #{wbsTreePrivate.uniqueCode},
+            partition_code = #{wbsTreePrivate.partitionCode},
+            table_type = #{wbsTreePrivate.tableType},
+            table_owner = #{wbsTreePrivate.tableOwner}
+        WHERE id = #{wbsTreePrivate.id}
           AND project_id = #{projectId}
           AND wbs_id = #{wbsId}
           AND status = 1
@@ -312,39 +312,7 @@
     </select>
 
     <select id="selectByCondition" resultType="org.springblade.manager.entity.WbsTreePrivate">
-        SELECT p_key_id,
-               id,
-               wbs_id,
-               wbs_type,
-               project_id,
-               tenant_id,
-               parent_id,
-               ancestors,
-               dept_category,
-               dept_name,
-               full_name,
-               sort,
-               remark,
-               type,
-               table_type,
-               create_time,
-               create_user,
-               create_dept,
-               update_user,
-               update_time,
-               status,
-               is_deleted,
-               unique_code,
-               partition_code,
-               is_expernode,
-               is_concrete,
-               table_owner,
-               major_data_type,
-               init_table_name,
-               is_link_table,
-               excel_id,
-               is_exist_form
-        FROM m_wbs_tree_private
+        SELECT * FROM m_wbs_tree_private
         WHERE (id = #{id}
             AND type = 1
             AND project_id = #{projectId}
@@ -370,39 +338,7 @@
     </select>
 
     <select id="selectIsTable" resultType="org.springblade.manager.entity.WbsTree">
-        SELECT p_key_id,
-               id,
-               wbs_id,
-               wbs_type,
-               project_id,
-               tenant_id,
-               parent_id,
-               ancestors,
-               dept_category,
-               dept_name,
-               full_name,
-               sort,
-               remark,
-               type,
-               table_type,
-               create_time,
-               create_user,
-               create_dept,
-               update_user,
-               update_time,
-               status,
-               is_deleted,
-               unique_code,
-               partition_code,
-               is_expernode,
-               is_concrete,
-               table_owner,
-               major_data_type,
-               init_table_name,
-               is_link_table,
-               excel_id,
-               is_exist_form
-        FROM m_wbs_tree_private
+        SELECT * FROM m_wbs_tree_private
         WHERE type = 2
           AND is_deleted = 0
           AND `status` = 1
@@ -410,15 +346,15 @@
           AND project_id = #{projectId}
     </select>
     <select id="selectByNodeTable" resultType="org.springblade.manager.vo.WbsNodeTableVO">
-        SELECT wt.p_key_id                                                  AS "pKeyId",
-               wt.id                                                        AS id,
-               wt.dept_name                                                 AS tableName,
-               wt.table_type                                                AS tableType,
-               wt.`status`                                                  AS isCreateTable,
-               wt.table_owner                                               as tableOwner,
+        SELECT wt.p_key_id AS "pKeyId",
+               wt.id AS id,
+               wt.dept_name AS tableName,
+               wt.table_type AS tableType,
+               wt.`status` AS isCreateTable,
+               wt.table_owner as tableOwner,
                wt.is_link_table,
                wt.init_table_name,
-               wt.excel_id                                                  as excelId,
+               wt.excel_id as excelId,
                wt.sort,
                wt.status,
                (SELECT count(1) FROM m_wbs_form_element WHERE f_id = wt.id) AS "elementTotal"
@@ -428,42 +364,10 @@
           AND wt.parent_id = #{id}
           AND wt.wbs_id = #{wbsId}
           AND wt.project_id = #{projectId}
-        ORDER BY wt.sort
+        ORDER BY wt.sort,wt.dept_name,wt.create_time
     </select>
     <select id="getByCondition" resultType="org.springblade.manager.entity.WbsTreePrivate">
-        SELECT p_key_id,
-               id,
-               wbs_id,
-               wbs_type,
-               project_id,
-               tenant_id,
-               parent_id,
-               ancestors,
-               dept_category,
-               dept_name,
-               full_name,
-               sort,
-               remark,
-               type,
-               table_type,
-               create_time,
-               create_user,
-               create_dept,
-               update_user,
-               update_time,
-               status,
-               is_deleted,
-               unique_code,
-               partition_code,
-               is_expernode,
-               is_concrete,
-               table_owner,
-               major_data_type,
-               init_table_name,
-               is_link_table,
-               excel_id,
-               is_exist_form
-        FROM m_wbs_tree_private
+        SELECT * FROM m_wbs_tree_private
         WHERE project_id = #{projectId}
           AND id = #{parentId}
           AND wbs_id = #{wbsId}
@@ -472,40 +376,7 @@
           AND type = 1
     </select>
     <select id="getByPKeyId" resultType="org.springblade.manager.entity.WbsTreePrivate">
-        SELECT p_key_id,
-               id,
-               wbs_id,
-               wbs_type,
-               project_id,
-               tenant_id,
-               parent_id,
-               ancestors,
-               dept_category,
-               dept_name,
-               full_name,
-               sort,
-               remark,
-               type,
-               table_type,
-               create_time,
-               create_user,
-               create_dept,
-               update_user,
-               update_time,
-               status,
-               is_deleted,
-               unique_code,
-               partition_code,
-               is_expernode,
-               is_concrete,
-               table_owner,
-               major_data_type,
-               init_table_name,
-               is_link_table,
-               excel_id,
-               is_exist_form,
-               html_url
-        FROM m_wbs_tree_private
+        SELECT * FROM m_wbs_tree_private
         WHERE p_key_id = #{pKeyId}
     </select>
 
@@ -521,39 +392,7 @@
           AND parent_id = 0
     </select>
     <select id="selectByPKeyId" resultType="org.springblade.manager.entity.WbsTreePrivate">
-        SELECT p_key_id,
-               id,
-               wbs_id,
-               wbs_type,
-               project_id,
-               tenant_id,
-               parent_id,
-               ancestors,
-               dept_category,
-               dept_name,
-               full_name,
-               sort,
-               remark,
-               type,
-               table_type,
-               create_time,
-               create_user,
-               create_dept,
-               update_user,
-               update_time,
-               status,
-               is_deleted,
-               unique_code,
-               partition_code,
-               is_expernode,
-               is_concrete,
-               table_owner,
-               major_data_type,
-               init_table_name,
-               is_link_table,
-               excel_id,
-               is_exist_form
-        FROM m_wbs_tree_private
+        SELECT * FROM m_wbs_tree_private
         WHERE p_key_id = #{referenceWbsTemplateId}
     </select>
 
@@ -570,12 +409,7 @@
     </select>
 
     <select id="selectNodeAndTable" resultType="org.springblade.manager.entity.WbsTreePrivate">
-        SELECT
-        p_key_id,id,wbs_id,wbs_type,project_id,tenant_id,parent_id,ancestors,dept_category,dept_name,full_name,sort,remark,type,
-        table_type,create_time,create_user,
-        create_dept,update_user,update_time,status,is_deleted,unique_code,partition_code,is_expernode,
-        is_concrete,table_owner,major_data_type,init_table_name,is_link_table,excel_id,is_exist_form,html_url
-        FROM m_wbs_tree_private
+        SELECT * FROM m_wbs_tree_private
         WHERE (
         type = 1
         <if test="id != null and id != ''">
@@ -597,40 +431,7 @@
     </select>
 
     <select id="selectNodeAndTable2" resultType="org.springblade.manager.entity.WbsTreePrivate">
-        SELECT p_key_id,
-               id,
-               wbs_id,
-               wbs_type,
-               project_id,
-               tenant_id,
-               parent_id,
-               ancestors,
-               dept_category,
-               dept_name,
-               full_name,
-               sort,
-               remark,
-               type,
-               table_type,
-               create_time,
-               create_user,
-               create_dept,
-               update_user,
-               update_time,
-               status,
-               is_deleted,
-               unique_code,
-               partition_code,
-               is_expernode,
-               is_concrete,
-               table_owner,
-               major_data_type,
-               init_table_name,
-               is_link_table,
-               excel_id,
-               is_exist_form,
-               html_url
-        FROM m_wbs_tree_private
+        SELECT * FROM m_wbs_tree_private
         WHERE project_id = #{referencePrivateWbsProjectId}
           AND wbs_id = #{wbsId}
           AND STATUS = 1

blade-service/blade-manager/src/main/java/org/springblade/manager/service/IWbsTreePrivateService.java

@@ -36,9 +36,8 @@ public interface IWbsTreePrivateService extends BaseService<WbsTreePrivate> {
 
     boolean updateStatus(String pKeyId);
 
-    boolean updateBatchByIds(List<WbsTree> wbsTreeListAll,String projectId);
-
-    boolean updateBatchByIds2(List<WbsTreePrivate> wbsTreePrivates, String projectId,String wbsId);
+    boolean updateBatchByIds(List<WbsTree> wbsTreeListAll, List<WbsTreePrivate> wbsTreePrivatesAll, String projectId);
 
+    boolean updateBatchByIds2(List<WbsTreePrivate> wbsTreePrivates, List<WbsTreePrivate> wbsTreePrivatesAllNow, String projectId, String wbsId);
 
 }

blade-service/blade-manager/src/main/java/org/springblade/manager/service/impl/WbsTreeContractServiceImpl.java

@@ -214,9 +214,7 @@ public class WbsTreeContractServiceImpl extends BaseServiceImpl<WbsTreeContractM
 
                 //新增施工台账
                 constructionLedgerFeign.initConstructionLedger(constructionLedgerList);
-
             }
-
         }
 
         return true;
@@ -256,6 +254,11 @@ public class WbsTreeContractServiceImpl extends BaseServiceImpl<WbsTreeContractM
         wbsTreeContract.setExcelId(wbsTree.getExcelId());
         wbsTreeContract.setHtmlUrl(wbsTree.getHtmlUrl());
         wbsTreeContract.setIsBussShow(1);
+        wbsTreeContract.setCreateTime(wbsTree.getCreateTime());
+        wbsTreeContract.setUpdateTime(wbsTree.getUpdateTime());
+        wbsTreeContract.setUpdateUser(wbsTree.getUpdateUser());
+        wbsTreeContract.setCreateUser(wbsTree.getCreateUser());
+        wbsTreeContract.setCreateDept(wbsTree.getCreateDept());
         if (wbsTree.getType() == 2) {
             wbsTreeContract.setIsTypePrivatePid(wbsTree.getPKeyId());
         }

blade-service/blade-manager/src/main/java/org/springblade/manager/service/impl/WbsTreePrivateServiceImpl.java

@@ -9,7 +9,6 @@ import org.springblade.core.log.exception.ServiceException;
 import org.springblade.core.mp.base.BaseServiceImpl;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.node.ForestNodeMerger;
-import org.springblade.core.tool.utils.BeanUtil;
 import org.springblade.core.tool.utils.StringPool;
 import org.springblade.manager.dto.WbsTreePrivateDTO2;
 import org.springblade.manager.dto.WbsTreePrivateDTO3;
@@ -19,7 +18,6 @@ import org.springblade.manager.mapper.ContractInfoMapper;
 import org.springblade.manager.mapper.WbsInfoMapper;
 import org.springblade.manager.mapper.WbsTreeContractMapper;
 import org.springblade.manager.mapper.WbsTreePrivateMapper;
-import org.springblade.manager.service.IWbsTreeContractService;
 import org.springblade.manager.service.IWbsTreePrivateService;
 import org.springblade.manager.vo.WbsNodeTableVO;
 import org.springblade.manager.vo.WbsTreePrivateVO;
@@ -40,7 +38,6 @@ public class WbsTreePrivateServiceImpl extends BaseServiceImpl<WbsTreePrivateMap
     private final ContractInfoMapper contractInfoMapper;
     private final WbsInfoMapper wbsInfoMapper;
 
-
     @Override
     public List<WbsTreePrivateVO> tree(String wbsId, String projectId) {
         //获取wbsType
@@ -265,32 +262,60 @@ public class WbsTreePrivateServiceImpl extends BaseServiceImpl<WbsTreePrivateMap
     }
 
     @Override
-    public boolean updateBatchByIds(List<WbsTree> wbsTreeListAll, String projectId) {
+    public boolean updateBatchByIds(List<WbsTree> wbsTreeListAll, List<WbsTreePrivate> wbsTreePrivatesAll, String projectId) {
         //获取当前项目下所有合同段信息
         List<ContractInfo> contractInfos = contractInfoMapper.selectList(Wrappers.<ContractInfo>query().lambda().eq(ContractInfo::getPId, projectId));
-        for (WbsTree wbsTreeList : wbsTreeListAll) {
-            //修改项目wbs节点信息、元素表基础信息
-            baseMapper.updateBatchByIds(wbsTreeList, projectId);
-            for (ContractInfo contractInfo : contractInfos) {
-                //修改合同段wbs节点信息、元素表基础信息
-                wbsTreeContractMapper.updateBatchByIds(wbsTreeList, contractInfo.getId());
+
+        for (WbsTree wbsTree : wbsTreeListAll) {
+            for (WbsTreePrivate wbsTreePrivate : wbsTreePrivatesAll) {
+                //判断相同节点基础信息、元素表类型、元素表所属方 是否发生改变
+                if (wbsTree.getId().equals(wbsTreePrivate.getId()) &&
+                        (!wbsTree.getDeptName().equals(wbsTreePrivate.getDeptName())
+                                || (wbsTree.getDeptCategory() != null && !wbsTree.getDeptCategory().equals(wbsTreePrivate.getDeptCategory()))
+                                || (wbsTree.getPartitionCode() != null && !wbsTree.getPartitionCode().equals(wbsTreePrivate.getPartitionCode()))
+                                || (wbsTree.getUniqueCode() != null && !wbsTree.getUniqueCode().equals(wbsTreePrivate.getUniqueCode()))
+                                || (wbsTree.getMajorDataType() != null && !wbsTree.getMajorDataType().equals(wbsTreePrivate.getMajorDataType()))
+                                || (wbsTree.getTableType() != null && !wbsTree.getTableType().equals(wbsTreePrivate.getTableType()))
+                                || (wbsTree.getTableOwner() != null && !wbsTree.getTableOwner().equals(wbsTreePrivate.getTableOwner())))) {
+                    //同步修改私有项目节点、元素表基础信息
+                    baseMapper.updateBatchByIds(wbsTree, projectId);
+
+                    //同步修改合同段节点信息、元素表基础信息
+                    for (ContractInfo contractInfo : contractInfos) {
+                        wbsTreeContractMapper.updateBatchByIds(wbsTree, contractInfo.getId());
+                    }
+                }
             }
         }
         return true;
     }
 
-
     @Override
-    public boolean updateBatchByIds2(List<WbsTreePrivate> wbsTreePrivates, String projectId, String wbsId) {
+    public boolean updateBatchByIds2(List<WbsTreePrivate> wbsTreePrivates, List<WbsTreePrivate> wbsTreePrivatesAllNow, String projectId, String wbsId) {
         //获取当前项目下所有合同段信息
         List<ContractInfo> contractInfos = contractInfoMapper.selectList(Wrappers.<ContractInfo>query().lambda().eq(ContractInfo::getPId, projectId));
-        for (WbsTreePrivate wbsTreeList : wbsTreePrivates) {
-            //修改项目wbs信息
-            baseMapper.updateBatchByIds2(wbsTreeList, projectId, wbsId);
 
-            for (ContractInfo contractInfo : contractInfos) {
-                //修改合同段wbs信息
-                wbsTreeContractMapper.updateBatchByIds2(wbsTreeList, contractInfo.getId());
+        for (WbsTreePrivate wbsTreePrivate : wbsTreePrivates) {
+            for (WbsTreePrivate treePrivateNow : wbsTreePrivatesAllNow) {
+                //判断相同节点基础信息、元素表类型、元素表所属方 是否发生改变
+                if (wbsTreePrivate.getId().equals(treePrivateNow.getId()) &&
+                        (!wbsTreePrivate.getDeptName().equals(treePrivateNow.getDeptName())
+                                || (wbsTreePrivate.getDeptCategory() != null && !wbsTreePrivate.getDeptCategory().equals(treePrivateNow.getDeptCategory()))
+                                || (wbsTreePrivate.getPartitionCode() != null && !wbsTreePrivate.getPartitionCode().equals(treePrivateNow.getPartitionCode()))
+                                || (wbsTreePrivate.getUniqueCode() != null && !wbsTreePrivate.getUniqueCode().equals(treePrivateNow.getUniqueCode()))
+                                || (wbsTreePrivate.getMajorDataType() != null && !wbsTreePrivate.getMajorDataType().equals(treePrivateNow.getMajorDataType()))
+                                || (wbsTreePrivate.getTableType() != null && !wbsTreePrivate.getTableType().equals(treePrivateNow.getTableType()))
+                                || (wbsTreePrivate.getTableOwner() != null && !wbsTreePrivate.getTableOwner().equals(treePrivateNow.getTableOwner())))) {
+
+                    //修改项目wbs信息
+                    baseMapper.updateBatchByIds2(wbsTreePrivate, projectId, wbsId);
+
+                    for (ContractInfo contractInfo : contractInfos) {
+                        //修改合同段wbs信息
+                        wbsTreeContractMapper.updateBatchByIds2(wbsTreePrivate, contractInfo.getId());
+                    }
+
+                }
             }
         }
         return true;

blade-service/blade-manager/src/main/java/org/springblade/manager/service/impl/WbsTreeServiceImpl.java

@@ -601,18 +601,14 @@ public class WbsTreeServiceImpl extends BaseServiceImpl<WbsTreeMapper, WbsTree>
     @Override
     public List<Map> findProjectAndContractList(Long userId) {
         List<SaveUserInfoByProjectVO2> list = baseMapper.selectListByUserId(userId);
-
         //用户项目合同段角色返回Map
         Map<String, List<SaveUserInfoByProjectVO2>> collect = list.stream().collect(Collectors.groupingBy(SaveUserInfoByProjectVO2::getProjectName));
-        List<Map> collect1 = collect.entrySet().stream().map(entity -> {
-            Map resultMap = new HashMap();
+        return collect.entrySet().stream().map(entity -> {
+            Map<String, Object> resultMap = new HashMap<>();
             resultMap.put("projectName", entity.getKey());
             resultMap.put("dataInfo", entity.getValue());
             return resultMap;
         }).collect(Collectors.toList());
-
-        return collect1;
-
     }
 
     @Override
@@ -703,8 +699,9 @@ public class WbsTreeServiceImpl extends BaseServiceImpl<WbsTreeMapper, WbsTree>
                 //公有同步新增元素表
                 //获取公有wbs树新增的元素表
                 List<WbsTree> allNodeList = findAllNodeList(wbsTreeIds);
+
+                //获取公有wbs树所有的节点、元素表
                 List<WbsTree> wbsTreeListAll = new ArrayList<>();
-                //获取公有wbs树所有的元素表
                 if (allNodeList != null) {
                     List<WbsTree> wbsTreeList = wbsTreeMapper.selectList(Wrappers.<WbsTree>query().lambda()
                             .eq(WbsTree::getWbsId, pawDTO.getWbsId())
@@ -713,32 +710,32 @@ public class WbsTreeServiceImpl extends BaseServiceImpl<WbsTreeMapper, WbsTree>
                     wbsTreeListAll.addAll(wbsTreeList);
                 }
 
-                //所有表单信息
-                List<WbsTree> wbsTreeListTables = wbsTreeListAll.stream().filter(f -> f.getType() == 2).collect(Collectors.toList());
-
                 //所有节点信息
                 //List<WbsTree> wbsTreeListNodes = wbsTreeListAll.stream().filter(f -> f.getType() == 1).collect(Collectors.toList());
 
+                //所有表单信息
+                List<WbsTree> wbsTreeListTables = wbsTreeListAll.stream().filter(f -> f.getType() == 2).collect(Collectors.toList());
+
                 //公有元素表的id
                 List<Long> collect1 = wbsTreeListTables.stream().map(WbsTree::getId).collect(Collectors.toList());
                 List<String> collect2 = collect1.stream().map(String::valueOf).collect(Collectors.toList());
 
-                //获取项目私有wbs树下当前所有的元素表
-                List<WbsTreePrivate> wbsTreePrivates1 = wbsTreePrivateMapper.selectList(Wrappers.<WbsTreePrivate>query().lambda()
+                //获取项目私有wbs树下所有的节点、元素表
+                List<WbsTreePrivate> wbsTreePrivatesAll = wbsTreePrivateMapper.selectList(Wrappers.<WbsTreePrivate>query().lambda()
                         .eq(WbsTreePrivate::getWbsId, pawDTO.getWbsId())
                         .eq(WbsTreePrivate::getProjectId, pawDTO.getProjectId())
-                        .eq(WbsTreePrivate::getType, 2)
+                        .eq(WbsTreePrivate::getStatus, 1)
                 );
 
                 //私有下元素表id
-                List<Long> collect3 = wbsTreePrivates1.stream().map(WbsTreePrivate::getId).collect(Collectors.toList());
+                List<WbsTreePrivate> collect = wbsTreePrivatesAll.stream().filter(f -> f.getType() == 2).collect(Collectors.toList());
+                List<Long> collect3 = collect.stream().map(WbsTreePrivate::getId).collect(Collectors.toList());
                 List<String> collect4 = collect3.stream().map(String::valueOf).collect(Collectors.toList());
 
                 List<String> diffRent1 = WbsTreeContractServiceImpl.getDiffrent(collect2, collect4);
 
-                //同步公有wbs节点信息、元素表基础信息到项目级wbs、合同段wbs
-                //wbsTreePrivateService.updateBatchByIds(wbsTreeListAll,pawDTO.getProjectId());
-                updateWbsInfoPrivateAsync(wbsTreeListAll, pawDTO.getProjectId());
+                //修改公有wbs节点信息、元素表基础信息到项目级wbs、合同段wbs
+                updateWbsInfoPrivateAsync(wbsTreeListAll, wbsTreePrivatesAll, pawDTO.getProjectId());
 
                 if (diffRent1.size() == 0) {
                     //当wbsTreeIds == "" 时 1.在第一次新增未选择wbs树时  2.同步新增的元素表时
@@ -823,39 +820,38 @@ public class WbsTreeServiceImpl extends BaseServiceImpl<WbsTreeMapper, WbsTree>
                 WbsTreePrivate wbsTreePrivate = wbsTreePrivateMapper.selectOne(Wrappers.<WbsTreePrivate>query().lambda()
                         .eq(WbsTreePrivate::getPKeyId, pawDTO.getPrimaryKeyId()));
 
-                //获取私有引用项目的wbs树的全部元素表+节点信息
-                List<WbsTreePrivate> wbsTreePrivates = wbsTreePrivateMapper.selectList(Wrappers.<WbsTreePrivate>query().lambda()
+                //获取私有引用项目的wbs树的所有节点、元素表
+                List<WbsTreePrivate> wbsTreePrivateAllOld = wbsTreePrivateMapper.selectList(Wrappers.<WbsTreePrivate>query().lambda()
                         .eq(WbsTreePrivate::getWbsId, wbsTreePrivate.getWbsId())
                         .eq(WbsTreePrivate::getProjectId, wbsTreePrivate.getProjectId())
                         .eq(WbsTreePrivate::getStatus, 1)
                 );
 
-                //私有引用项目的表单信息
-                List<WbsTreePrivate> WbsTreePrivateTables = wbsTreePrivates.stream().filter(f -> f.getType() == 2).collect(Collectors.toList());
-
                 //私有引用项目的节点信息
-                //List<WbsTreePrivate> WbsTreePrivateNodes = wbsTreePrivates.stream().filter(f -> f.getType() == 1).collect(Collectors.toList());
+                //List<WbsTreePrivate> WbsTreePrivateNodes = wbsTreePrivateAllOld.stream().filter(f -> f.getType() == 1).collect(Collectors.toList());
+
+                //私有引用项目的表单信息
+                List<WbsTreePrivate> WbsTreePrivateTables = wbsTreePrivateAllOld.stream().filter(f -> f.getType() == 2).collect(Collectors.toList());
 
                 //当前新增表单的id
                 List<Long> collect1 = WbsTreePrivateTables.stream().map(WbsTreePrivate::getId).collect(Collectors.toList());
                 List<String> collect2 = collect1.stream().map(String::valueOf).collect(Collectors.toList());
 
-                //获取当前项目私有wbs树下当前所有的元素表
-                List<WbsTreePrivate> wbsTreePrivates1 = wbsTreePrivateMapper.selectList(Wrappers.<WbsTreePrivate>query().lambda()
+                //获取当前项目私有wbs树下当前所有节点、元素表
+                List<WbsTreePrivate> wbsTreePrivatesAllNow = wbsTreePrivateMapper.selectList(Wrappers.<WbsTreePrivate>query().lambda()
                         .eq(WbsTreePrivate::getWbsId, pawDTO.getPrimaryKeyId())
                         .eq(WbsTreePrivate::getProjectId, pawDTO.getProjectId())
-                        .eq(WbsTreePrivate::getType, 2)
                 );
 
                 //当前存在的表单的id
-                List<Long> collect3 = wbsTreePrivates1.stream().map(WbsTreePrivate::getId).collect(Collectors.toList());
+                List<WbsTreePrivate> wbsTreePrivateNowTypes = wbsTreePrivatesAllNow.stream().filter(f -> f.getType() == 2).collect(Collectors.toList());
+                List<Long> collect3 = wbsTreePrivateNowTypes.stream().map(WbsTreePrivate::getId).collect(Collectors.toList());
                 List<String> collect4 = collect3.stream().map(String::valueOf).collect(Collectors.toList());
 
                 List<String> diffRent1 = WbsTreeContractServiceImpl.getDiffrent(collect2, collect4);
 
-                //同步私有wbs节点信息、元素表基础信息到项目级wbs、合同段wbs
-                //wbsTreePrivateService.updateBatchByIds2(wbsTreePrivates, pawDTO.getProjectId(), pawDTO.getPrimaryKeyId());
-                updateWbsInfoContractAsync(wbsTreePrivates, pawDTO.getProjectId(), pawDTO.getPrimaryKeyId());
+                //修改私有wbs节点信息、元素表基础信息到项目级wbs、合同段wbs
+                updateWbsInfoContractAsync(wbsTreePrivateAllOld, wbsTreePrivatesAllNow, pawDTO.getProjectId(), pawDTO.getPrimaryKeyId());
 
                 if (diffRent1.size() == 0) {
                     return true;
@@ -1084,18 +1080,15 @@ public class WbsTreeServiceImpl extends BaseServiceImpl<WbsTreeMapper, WbsTree>
     }
 
     @Async
-    public boolean updateWbsInfoPrivateAsync(List<WbsTree> wbsTreeListAll, String projectId) {
-        wbsTreePrivateService.updateBatchByIds(wbsTreeListAll, projectId);
-        return true;
+    public boolean updateWbsInfoPrivateAsync(List<WbsTree> wbsTreeListAll, List<WbsTreePrivate> wbsTreePrivatesAll, String projectId) {
+        return wbsTreePrivateService.updateBatchByIds(wbsTreeListAll, wbsTreePrivatesAll, projectId);
     }
 
     @Async
-    public boolean updateWbsInfoContractAsync(List<WbsTreePrivate> wbsTreePrivates, String projectId, String primaryKeyId) {
-        wbsTreePrivateService.updateBatchByIds2(wbsTreePrivates, projectId, primaryKeyId);
-        return true;
+    public boolean updateWbsInfoContractAsync(List<WbsTreePrivate> wbsTreePrivates, List<WbsTreePrivate> wbsTreePrivatesAllNow, String projectId, String primaryKeyId) {
+        return wbsTreePrivateService.updateBatchByIds2(wbsTreePrivates, wbsTreePrivatesAllNow, projectId, primaryKeyId);
     }
 
-
     private WbsTreePrivate getWbsTreePrivate1(WbsTree wbsTree, WbsTreeContractDTO pawDTO) {
         WbsTreePrivate wbsTreePrivate = new WbsTreePrivate();
         //数据初始化
@@ -1126,6 +1119,14 @@ public class WbsTreeServiceImpl extends BaseServiceImpl<WbsTreeMapper, WbsTree>
         wbsTreePrivate.setInitTableName(wbsTree.getInitTableName());
         wbsTreePrivate.setIsLinkTable(wbsTree.getIsLinkTable());
         wbsTreePrivate.setIsExistForm(wbsTree.getIsExistForm());
+
+        wbsTreePrivate.setCreateTime(wbsTree.getCreateTime());
+        wbsTreePrivate.setUpdateTime(wbsTree.getUpdateTime());
+        wbsTreePrivate.setUpdateUser(wbsTree.getUpdateUser());
+        wbsTreePrivate.setCreateUser(wbsTree.getCreateUser());
+        wbsTreePrivate.setCreateDept(wbsTree.getCreateDept());
+
+
         return wbsTreePrivate;
     }
 
@@ -1160,6 +1161,13 @@ public class WbsTreeServiceImpl extends BaseServiceImpl<WbsTreeMapper, WbsTree>
         wbsTreePrivate.setIsLinkTable(wbsTree.getIsLinkTable());
         wbsTreePrivate.setIsExistForm(wbsTree.getIsExistForm());
         wbsTreePrivate.setHtmlUrl(wbsTree.getHtmlUrl());
+
+        wbsTreePrivate.setCreateTime(wbsTree.getCreateTime());
+        wbsTreePrivate.setUpdateTime(wbsTree.getUpdateTime());
+        wbsTreePrivate.setUpdateUser(wbsTree.getUpdateUser());
+        wbsTreePrivate.setCreateUser(wbsTree.getCreateUser());
+        wbsTreePrivate.setCreateDept(wbsTree.getCreateDept());
+
         return wbsTreePrivate;
     }
 
@@ -1196,6 +1204,13 @@ public class WbsTreeServiceImpl extends BaseServiceImpl<WbsTreeMapper, WbsTree>
         wbsTreeContract.setExcelId(wbsTree.getExcelId());
         wbsTreeContract.setHtmlUrl(wbsTree.getHtmlUrl());
         wbsTreeContract.setIsBussShow(1);
+
+        wbsTreeContract.setCreateTime(wbsTree.getCreateTime());
+        wbsTreeContract.setUpdateTime(wbsTree.getUpdateTime());
+        wbsTreeContract.setUpdateUser(wbsTree.getUpdateUser());
+        wbsTreeContract.setCreateUser(wbsTree.getCreateUser());
+        wbsTreeContract.setCreateDept(wbsTree.getCreateDept());
+
         if (wbsTree.getType() == 2) {
             wbsTreeContract.setIsTypePrivatePid(wbsTree.getPKeyId());
         }