公有元素表同步私有排序问题

blade-service/blade-manager/src/main/java/org/springblade/manager/controller/ContractInfoController.java

@@ -321,11 +321,11 @@ public class ContractInfoController extends BladeController {
 
 
     /**
-     * 项目分配用户批量保存-项目合同分配人员
+     * 保存-项目合同段分配人员
      */
     @PostMapping("/saveUserInfoByProjectTow")
     @ApiOperationSupport(order = 13)
-    @ApiOperation(value = "保存-项目合同分配人员", notes = "传入项目id、合同id、岗位处roleId、用户id")
+    @ApiOperation(value = "保存-项目合同段分配人员", notes = "传入项目id、合同id、岗位处roleId、用户id")
     @Transactional(rollbackFor = Exception.class)
     public R saveUserInfoByProjectTow(@RequestBody List<SaveUserInfoByProjectDTO> list) {
         if (list.size() > 0) {

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

@@ -76,6 +76,8 @@ public interface WbsTreePrivateMapper extends BaseMapper<WbsTreePrivate> {
 
     void updateSortById2(Long pKeyId, Integer sort);
 
+    void updateSortById3(String id, Integer sort);
+
     int updateIsDeletedByPKeyId(String pKeyId);
 
     List<WbsTreePrivate> selectNodeAndTable(String id, String wbsId, String referencePrivateWbsProjectId);
@@ -83,4 +85,5 @@ public interface WbsTreePrivateMapper extends BaseMapper<WbsTreePrivate> {
     List<WbsTreePrivate> selectNodeAndTable2(String wbsId, String referencePrivateWbsProjectId);
 
     boolean updateBatchByPid(@Param("wbsTreePrivates") WbsTreePrivateDTO3 wbsTreePrivates);
+
 }

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

@@ -57,128 +57,148 @@
         <result column="isExistForm" property="isExistForm"/>
     </resultMap>
     <insert id="insertCombination1">
-        INSERT INTO m_wbs_tree_private(
-        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)
-        VALUES(
-        #{snowId},#{wbsTree.id},#{wbsTree.wbsId},#{wbsType},#{projectId},#{wbsTree.tenantId},#{wbsTree.parentId},#{wbsTree.ancestors},
-        #{wbsTree.deptCategory},#{wbsTree.deptName},#{wbsTree.fullName},#{wbsTree.sort},#{wbsTree.remark},#{wbsTree.type},
-        #{wbsTree.tableType},#{wbsTree.createTime},#{wbsTree.createUser},#{wbsTree.createDept},#{wbsTree.updateUser},#{wbsTree.updateTime},
-        #{wbsTree.status},#{wbsTree.isDeleted},#{wbsTree.uniqueCode},#{wbsTree.partitionCode},#{wbsTree.isExpernode},#{wbsTree.isConcrete},
-        #{wbsTree.tableOwner},#{wbsTree.majorDataType},#{wbsTree.initTableName},#{wbsTree.isLinkTable})
+        INSERT INTO m_wbs_tree_private(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)
+        VALUES (#{snowId}, #{wbsTree.id}, #{wbsTree.wbsId}, #{wbsType}, #{projectId}, #{wbsTree.tenantId},
+                #{wbsTree.parentId}, #{wbsTree.ancestors},
+                #{wbsTree.deptCategory}, #{wbsTree.deptName}, #{wbsTree.fullName}, #{wbsTree.sort}, #{wbsTree.remark},
+                #{wbsTree.type},
+                #{wbsTree.tableType}, #{wbsTree.createTime}, #{wbsTree.createUser}, #{wbsTree.createDept},
+                #{wbsTree.updateUser}, #{wbsTree.updateTime},
+                #{wbsTree.status}, #{wbsTree.isDeleted}, #{wbsTree.uniqueCode}, #{wbsTree.partitionCode},
+                #{wbsTree.isExpernode}, #{wbsTree.isConcrete},
+                #{wbsTree.tableOwner}, #{wbsTree.majorDataType}, #{wbsTree.initTableName}, #{wbsTree.isLinkTable})
     </insert>
 
     <insert id="insertCombination2">
-        INSERT INTO m_wbs_tree_private(
-        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)
-        VALUES(
-        #{snowId},#{wbsTree.id},#{wbsTree.wbsId},#{wbsTree.wbsType},#{projectId},#{wbsTree.tenantId},#{wbsTree.parentId},#{wbsTree.ancestors},
-        #{wbsTree.deptCategory},#{wbsTree.deptName},#{wbsTree.fullName},#{wbsTree.sort},#{wbsTree.remark},#{wbsTree.type},
-        #{wbsTree.tableType},#{wbsTree.createTime},#{wbsTree.createUser},#{wbsTree.createDept},#{wbsTree.updateUser},#{wbsTree.updateTime},
-        #{wbsTree.status},#{wbsTree.isDeleted},#{wbsTree.uniqueCode},#{wbsTree.partitionCode},#{wbsTree.isExpernode},#{wbsTree.isConcrete},
-        #{wbsTree.tableOwner},#{wbsTree.majorDataType},#{wbsTree.initTableName},#{wbsTree.isLinkTable})
+        INSERT INTO m_wbs_tree_private(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)
+        VALUES (#{snowId}, #{wbsTree.id}, #{wbsTree.wbsId}, #{wbsTree.wbsType}, #{projectId}, #{wbsTree.tenantId},
+                #{wbsTree.parentId}, #{wbsTree.ancestors},
+                #{wbsTree.deptCategory}, #{wbsTree.deptName}, #{wbsTree.fullName}, #{wbsTree.sort}, #{wbsTree.remark},
+                #{wbsTree.type},
+                #{wbsTree.tableType}, #{wbsTree.createTime}, #{wbsTree.createUser}, #{wbsTree.createDept},
+                #{wbsTree.updateUser}, #{wbsTree.updateTime},
+                #{wbsTree.status}, #{wbsTree.isDeleted}, #{wbsTree.uniqueCode}, #{wbsTree.partitionCode},
+                #{wbsTree.isExpernode}, #{wbsTree.isConcrete},
+                #{wbsTree.tableOwner}, #{wbsTree.majorDataType}, #{wbsTree.initTableName}, #{wbsTree.isLinkTable})
     </insert>
 
 
     <update id="deleteByCondition">
-        UPDATE m_wbs_tree_private SET is_deleted = 1 WHERE
-        id = #{id}
-        AND wbs_id = #{wbsId}
-        AND project_id = #{projectId}
+        UPDATE m_wbs_tree_private
+        SET is_deleted = 1
+        WHERE id = #{id}
+          AND wbs_id = #{wbsId}
+          AND project_id = #{projectId}
     </update>
 
     <update id="deleteByCondition2">
-        UPDATE m_wbs_tree_private SET is_deleted = 1 WHERE
-        parent_id = #{id}
-        AND wbs_id = #{wbsId}
-        AND project_id = #{projectId}
+        UPDATE m_wbs_tree_private
+        SET is_deleted = 1
+        WHERE parent_id = #{id}
+          AND wbs_id = #{wbsId}
+          AND project_id = #{projectId}
     </update>
 
     <update id="updateByCondition">
         UPDATE m_wbs_tree_private
         SET is_deleted = 0
         WHERE id = #{id}
-        AND wbs_id = #{wbsId}
-        AND project_id = #{projectId}
+          AND wbs_id = #{wbsId}
+          AND project_id = #{projectId}
     </update>
 
     <update id="updateTableByCondition">
         UPDATE m_wbs_tree_private
         SET is_deleted = 0
         WHERE parent_id = #{id}
-        AND project_id = #{projectId}
-        AND wbs_id = #{wbsId}
-        AND type = 2
+          AND project_id = #{projectId}
+          AND wbs_id = #{wbsId}
+          AND type = 2
     </update>
 
     <update id="updateByCondition1">
-        UPDATE m_wbs_tree_private SET is_deleted = 1
+        UPDATE m_wbs_tree_private
+        SET is_deleted = 1
         WHERE status = 1
-        AND type = 2
-        AND id = #{id}
-        AND wbs_id = #{wbsId}
-        AND project_id = #{projectId}
+          AND type = 2
+          AND id = #{id}
+          AND wbs_id = #{wbsId}
+          AND project_id = #{projectId}
     </update>
 
     <update id="updateByPKeyId">
-    update m_wbs_tree_private
-    set
-    tenant_id = #{wbsTP.tenantId},
-    parent_id = #{wbsTP.parentId},
-    dept_category = #{wbsTP.deptCategory},
-    dept_name = #{wbsTP.deptName},
-    ancestors = #{wbsTP.ancestors},
-    unique_code = #{wbsTP.uniqueCode},
-    partition_code = #{wbsTP.partitionCode},
-    major_data_type = #{wbsTP.majorDataType},
-    create_user = #{wbsTP.createUser},
-    create_dept = #{wbsTP.createDept},
-    create_time = #{wbsTP.createTime},
-    update_user = #{wbsTP.updateUser},
-    update_time = #{wbsTP.updateTime},
-    status = 1 ,is_deleted = 0
-    where p_key_id = #{pKeyId}
+        update m_wbs_tree_private
+        set tenant_id       = #{wbsTP.tenantId},
+            parent_id       = #{wbsTP.parentId},
+            dept_category   = #{wbsTP.deptCategory},
+            dept_name       = #{wbsTP.deptName},
+            ancestors       = #{wbsTP.ancestors},
+            unique_code     = #{wbsTP.uniqueCode},
+            partition_code  = #{wbsTP.partitionCode},
+            major_data_type = #{wbsTP.majorDataType},
+            create_user     = #{wbsTP.createUser},
+            create_dept     = #{wbsTP.createDept},
+            create_time     = #{wbsTP.createTime},
+            update_user     = #{wbsTP.updateUser},
+            update_time     = #{wbsTP.updateTime},
+            status          = 1,
+            is_deleted      = 0
+        where p_key_id = #{pKeyId}
     </update>
 
     <update id="updateSortById">
         UPDATE m_wbs_tree_private
         SET sort = #{sort}
         WHERE p_key_id = #{pKeyId}
-        AND type = 1
-        AND status = 1
-        AND is_deleted = 0
+          AND type = 1
+          AND status = 1
+          AND is_deleted = 0
     </update>
     <update id="updateSortById2">
         UPDATE m_wbs_tree_private
         SET sort = #{sort}
         WHERE p_key_id = #{pKeyId}
-        AND type = 2
-        AND status = 1
-        AND is_deleted = 0
+          AND type = 2
+          AND status = 1
+          AND is_deleted = 0
+    </update>
+
+    <update id="updateSortById3">
+        UPDATE m_wbs_tree_private
+        SET sort = #{sort}
+        WHERE id = #{id}
+          AND type = 2
+          AND status = 1
+          AND is_deleted = 0
     </update>
 
     <update id="updateIsDeletedByPKeyId">
         UPDATE m_wbs_tree_private
         SET is_deleted = 1
         WHERE p_key_id = #{pKeyId}
-        AND status = 1
-        AND is_deleted = 0
+          AND status = 1
+          AND is_deleted = 0
     </update>
 
     <update id="updateBatchByPid">
         UPDATE m_wbs_tree_private
-        SET dept_name = #{wbsTreePrivates.deptName},
-        full_name =#{wbsTreePrivates.deptName},
-        table_type = #{wbsTreePrivates.tableType},
-        table_owner = #{wbsTreePrivates.tableOwner}
-        WHERE
-        p_key_id = #{wbsTreePrivates.pKeyId}
+        SET dept_name   = #{wbsTreePrivates.deptName},
+            full_name   =#{wbsTreePrivates.deptName},
+            table_type  = #{wbsTreePrivates.tableType},
+            table_owner = #{wbsTreePrivates.tableOwner}
+        WHERE p_key_id = #{wbsTreePrivates.pKeyId}
     </update>
 
-
     <select id="lazyTree" resultMap="treeNodeResultMap">
         SELECT
         dept.p_key_id as "primaryKeyId",
@@ -256,130 +276,260 @@
     </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
+        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
-        WHERE
-        ( id = #{id}
-        AND type = 1
-        AND project_id = #{projectId}
-        AND wbs_id =  #{wbsId}
-        AND STATUS = 1
-        AND is_deleted = 0 )
-        OR
-        ( parent_id = #{id}
-        AND type = 2
-        AND project_id = #{projectId}
-        AND wbs_id = #{wbsId}
-        AND STATUS = 1
-        AND is_deleted = 0 )
-    </select>
-
-    <select id="selectByCondition2" resultType="org.springblade.manager.entity.WbsTreePrivate">
-        SELECT
-            p_key_id
-        FROM
-            m_wbs_tree_private
-        WHERE
-            id = #{id}
+        WHERE (id = #{id}
+            AND type = 1
+            AND project_id = #{projectId}
+            AND wbs_id = #{wbsId}
+            AND STATUS = 1
+            AND is_deleted = 0)
+           OR (parent_id = #{id}
+            AND type = 2
             AND project_id = #{projectId}
             AND wbs_id = #{wbsId}
             AND STATUS = 1
-            AND is_deleted = 1
+            AND is_deleted = 0)
+    </select>
+
+    <select id="selectByCondition2" resultType="org.springblade.manager.entity.WbsTreePrivate">
+        SELECT p_key_id
+        FROM m_wbs_tree_private
+        WHERE id = #{id}
+          AND project_id = #{projectId}
+          AND wbs_id = #{wbsId}
+          AND STATUS = 1
+          AND is_deleted = 1
     </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
-        WHERE
-            type = 2
-            AND is_deleted = 0
-            AND `status` = 1
-            AND parent_id = #{tableId}
-            AND project_id = #{projectId}
+        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
+        WHERE type = 2
+          AND is_deleted = 0
+          AND `status` = 1
+          AND parent_id = #{tableId}
+          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,
-            wt.is_link_table,
-            wt.init_table_name,
-            wt.excel_id as excelId,
-            wt.sort,
-            wt.status
-        FROM
-            m_wbs_tree_private AS wt
-        WHERE
-            wt.type = 2
-        AND wt.is_deleted = 0
-        AND wt.parent_id = #{id}
-        AND wt.wbs_id = #{wbsId}
-        AND wt.project_id = #{projectId}
+        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.sort,
+               wt.status
+        FROM m_wbs_tree_private AS wt
+        WHERE wt.type = 2
+          AND wt.is_deleted = 0
+          AND wt.parent_id = #{id}
+          AND wt.wbs_id = #{wbsId}
+          AND wt.project_id = #{projectId}
         ORDER BY wt.sort
     </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
+        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
         WHERE project_id = #{projectId}
-        AND id = #{parentId}
-        AND wbs_id = #{wbsId}
-        AND is_deleted = 0
-        AND status = 1
-        AND type = 1
+          AND id = #{parentId}
+          AND wbs_id = #{wbsId}
+          AND is_deleted = 0
+          AND status = 1
+          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
+        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
         WHERE p_key_id = #{pKeyId}
     </select>
 
     <select id="selectByCondition3" resultType="org.springblade.manager.entity.WbsTreePrivate">
-        SELECT
-            p_key_id
-        FROM
-            m_wbs_tree_private
-        WHERE
-            id = #{id}
-            AND project_id = #{referencePrivateWbsProjectId}
-            AND wbs_id = #{wbsId}
-            AND STATUS = 1
-            AND is_deleted = 0
-            AND type = 1
-            AND parent_id = 0
+        SELECT p_key_id
+        FROM m_wbs_tree_private
+        WHERE id = #{id}
+          AND project_id = #{referencePrivateWbsProjectId}
+          AND wbs_id = #{wbsId}
+          AND STATUS = 1
+          AND is_deleted = 0
+          AND type = 1
+          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 WHERE p_key_id = #{referenceWbsTemplateId}
+        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
+        WHERE p_key_id = #{referenceWbsTemplateId}
     </select>
 
     <select id="selectNodeListByCondition" resultType="org.springblade.manager.dto.WbsTreePrivateDTO2">
-        SELECT p_key_id as "pKeyId",dept_name AS "tableName",sort
+        SELECT p_key_id as "pKeyId", dept_name AS "tableName", sort
         FROM m_wbs_tree_private
         WHERE project_id = #{projectId}
-        AND parent_id = #{parentId}
-        AND wbs_id = #{wbsId}
-        AND status = 1
-        AND is_deleted = 0
-        AND type = 1
+          AND parent_id = #{parentId}
+          AND wbs_id = #{wbsId}
+          AND status = 1
+          AND is_deleted = 0
+          AND type = 1
         ORDER BY sort
     </select>
 
@@ -391,7 +541,7 @@
         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
         WHERE (
-         type = 1
+        type = 1
         <if test="id != null and id != ''">
             AND id = #{id}
         </if>
@@ -400,7 +550,7 @@
         AND STATUS = 1
         AND is_deleted = 0)
         OR (
-         type = 2
+        type = 2
         <if test="id != null and id != ''">
             parent_id = #{id}
         </if>
@@ -411,16 +561,44 @@
     </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
+        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
-        WHERE  project_id = #{referencePrivateWbsProjectId}
-        AND wbs_id = #{wbsId}
-        AND STATUS = 1
-        AND is_deleted = 0
+        WHERE project_id = #{referencePrivateWbsProjectId}
+          AND wbs_id = #{wbsId}
+          AND STATUS = 1
+          AND is_deleted = 0
     </select>
 
 </mapper>

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

@@ -45,6 +45,7 @@ import org.springblade.manager.excel.WbsFormElementBatchExcel;
 import org.springblade.manager.excel.WbsFormElementExcel;
 import org.springblade.manager.mapper.WbsFormElementMapper;
 import org.springblade.manager.mapper.WbsTreeMapper;
+import org.springblade.manager.mapper.WbsTreePrivateMapper;
 import org.springblade.manager.service.IWbsFormElementService;
 import org.springblade.manager.service.IWbsTreeService;
 import org.springblade.manager.vo.WbsFormElementVO;
@@ -69,6 +70,7 @@ public class WbsFormElementServiceImpl extends BaseServiceImpl<WbsFormElementMap
 
     private final WbsFormElementMapper wbsFormElementMapper;
     private final WbsTreeMapper wbsTreeMapper;
+    private final WbsTreePrivateMapper wbsTreePrivateMapper;
 
 
     @Override
@@ -253,10 +255,8 @@ public class WbsFormElementServiceImpl extends BaseServiceImpl<WbsFormElementMap
     @Transactional(rollbackFor = Exception.class)
     public boolean deleteAndSyn(String ids, String eKey, String tableName) {
         deleteLogic(Func.toLongList(ids));
-
         int row = baseMapper.judgeFiled(eKey, tableName);
         if (row > 0) {
-
             baseMapper.deleteTableFiled(eKey, tableName);
         }
         return true;
@@ -288,8 +288,8 @@ public class WbsFormElementServiceImpl extends BaseServiceImpl<WbsFormElementMap
                 e.printStackTrace();
             }
         }
-
         return "0";
+
     }
 
     @Override
@@ -304,16 +304,18 @@ public class WbsFormElementServiceImpl extends BaseServiceImpl<WbsFormElementMap
         for (WbsFormElementDTO2 wbsTree : wbsTreeDTO) {
             wbsTree.setSort(number);
             baseMapper.updateSortById(wbsTree.getId(), wbsTree.getSort());
+
+            //同步修改所有引用该树的项目级元素表顺序
+            wbsTreePrivateMapper.updateSortById3(wbsTree.getId(), wbsTree.getSort());
             number++;
         }
-
         return true;
+
     }
 
     @Override
     public WbsFormElementVO getDetailById(WbsFormElement wbsFormElement) {
-        WbsFormElementVO detail = baseMapper.selectDetailById(wbsFormElement.getId());
-        return detail;
+        return baseMapper.selectDetailById(wbsFormElement.getId());
 
     }
 
@@ -410,6 +412,7 @@ public class WbsFormElementServiceImpl extends BaseServiceImpl<WbsFormElementMap
                     wbsFormElementInfo.setId(SnowFlakeUtil.getId());
                     wbsFormElementInfo.setFId(tableId);
                     wbsFormElementInfo.setStatus(1);
+                    wbsFormElementInfo.setELength(Integer.parseInt(setDefaultElementLength(wbsFormElementInfo.getEType())));
 
                     baseMapper.insert(wbsFormElementInfo);
 

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

@@ -180,10 +180,8 @@ public class WbsTreePrivateServiceImpl extends BaseServiceImpl<WbsTreePrivateMap
                 updateWrapper.set(WbsTreeContract::getSort, number);
                 wbsTreeContractMapper.update(null, updateWrapper);
             }
-
             number++;
         }
-
         return true;
     }