Merge remote-tracking branch 'origin/master' into master

blade-service/blade-business/src/main/java/org/springblade/business/controller/InformationWriteQueryController.java

@@ -574,6 +574,13 @@ public class InformationWriteQueryController extends BladeController {
         if (businessData != null) {
             //使用批量废除接口
             return this.batchAbolish(businessData.getId().toString(), primaryKeyId);
+        } else {
+            //试验
+            InformationQuery businessDataTrial = this.informationQueryService.getOne(Wrappers.<InformationQuery>lambdaQuery().eq(InformationQuery::getWbsId, primaryKeyId).eq(InformationQuery::getClassify, classify).eq(InformationQuery::getType, 2));
+            if (businessDataTrial != null) {
+                //使用批量废除接口
+                return this.batchAbolish(businessDataTrial.getId().toString(), primaryKeyId);
+            }
         }
         return R.data(300, false, "废除失败,未找到业务数据");
     }
@@ -1656,20 +1663,20 @@ public class InformationWriteQueryController extends BladeController {
                     //拼接操作记录
                     List<CopyContractTreeNodeVO.CopyBatch> list = vo.getCopyBatchToPaths();
                     Set<String> titles = new HashSet<>();
-                    list.stream().forEach(l->titles.add(l.getTitle()));
+                    list.stream().forEach(l -> titles.add(l.getTitle()));
                     StringBuilder addNames = new StringBuilder();
                     addNames.append("{");
                     for (String title : titles) {
-                        addNames.append(title+"-[");
+                        addNames.append(title + "-[");
                         for (CopyContractTreeNodeVO.CopyBatch li : list) {
-                            if (title.equals(li.getTitle())){
-                                addNames.append(li.getNodeName()+",");
+                            if (title.equals(li.getTitle())) {
+                                addNames.append(li.getNodeName() + ",");
                             }
                         }
-                        addNames.setLength(addNames.length()-1);
+                        addNames.setLength(addNames.length() - 1);
                         addNames.append("],");
                     }
-                    addNames.setLength(addNames.length()-1);
+                    addNames.setLength(addNames.length() - 1);
                     addNames.append("}");
                     needCopyNodeRoot.setNodeName(addNames.toString());
 //                    return R.success("操作成功");
@@ -2917,7 +2924,7 @@ public class InformationWriteQueryController extends BladeController {
                 result.add(currentNode);
                 this.queryParentNode(currentNode, result);
                 StringBuilder pathName = new StringBuilder();
-                for (int i = 1, l = result.size()-1; i < l; i++) {
+                for (int i = 1, l = result.size() - 1; i < l; i++) {
                     WbsTreeContract node = result.get(result.size() - i);
                     pathName.append("-").append(StringUtils.isNotEmpty(node.getFullName()) ? node.getFullName() : node.getNodeName());
                 }