合同段wbs删除相关

blade-service/blade-manager/pom.xml

@@ -135,7 +135,6 @@
             <artifactId>paperless.base</artifactId>
             <version>4.6.0.2</version>
         </dependency>
-        <!-- 电签类引用 -->
 
     </dependencies>
 

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

@@ -557,7 +557,7 @@
     </select>
 
     <select id="selectTableListInfo" resultType="org.springblade.manager.entity.WbsTreeContract">
-        SELECT p_key_id,id,dept_name,type,parent_id FROM m_wbs_tree_contract
+        SELECT p_key_id,id,dept_name,type,parent_id,is_tab_pdf FROM m_wbs_tree_contract
         WHERE ( id IN
         <foreach item="ids" collection="ids" open="(" close=")" separator=",">
             #{ids}

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

@@ -287,7 +287,7 @@ public class WbsTreeContractServiceImpl
                 //获取当前节点、表的信息
                 List<WbsTreeContract> wbsTreeContractList = baseMapper.selectTableListInfo(ids1, pawDTO.getWbsId(), pawDTO.getProjectId(), pawDTO.getContractId());
 
-                //获取当前表的pKeyId
+                /*//获取当前表的pKeyId
                 List<Long> pKeyIds = wbsTreeContractList.stream().filter(f -> f.getType() == 2).
                         map(WbsTreeContract::getPKeyId).collect(Collectors.toList());
 
@@ -309,10 +309,22 @@ public class WbsTreeContractServiceImpl
                                 wbsTreeContractTables.stream().map(WbsTreeContract::getParentId).collect(Collectors.toList()).contains(f.getId()))
                         .collect(Collectors.toList());
                 List<String> nodeNames = collect.stream().map(WbsTreeContract::getDeptName).collect(Collectors.toList());
+                */
 
-                if (inFormationQueryInfoList.size() > 0) {
+                List<WbsTreeContract> tableNames = new ArrayList<>();
+                if (wbsTreeContractList.size() > 0) {
+                    for (WbsTreeContract wbsTreeContract : wbsTreeContractList) {
+                        if (wbsTreeContract.getIsTabPdf() == 2) {
+                            tableNames.add(wbsTreeContract);
+                        }
+                    }
+                }
+
+                List<String> nodeNames = tableNames.stream().map(WbsTreeContract::getDeptName).collect(Collectors.toList());
+
+                if (nodeNames.size() > 0) {
                     String names = StringUtils.join(nodeNames, " , ");
-                    throw new ServiceException(StringUtil.format("节点 {} 下存在填报数据，删除失败！", names));
+                    throw new ServiceException(StringUtil.format("节点下的 {} 中存在填报数据，删除失败！", names));
                 }
 
                 //删除