bug相关

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

@@ -1490,7 +1490,7 @@ public class InformationWriteQueryController extends BladeController {
                         tabOwner = "1,2,3,4,5,6"; //如果选择的是否复制数据=0（否），默认所属方123456
                     }
 
-                    //创建线程池，默认设置8个线程
+                    //创建线程池，默认设置4个线程
                     ExecutorService executor = Executors.newFixedThreadPool(4);
                     try {
                         //解析位置信息，进行复制数据构造
@@ -1580,7 +1580,7 @@ public class InformationWriteQueryController extends BladeController {
                             this.addCopyTabFile(tabs, addChildNodesTablesOldAll);
                         }
                     }
-                    if (row && resultTablesData.size() > 0) {
+                    if (resultTablesData.size() > 0) {
                         jdbcTemplate.execute(StringUtils.join(resultTablesData, ""));
                     }
                     if (row && asyncWbsTreeNodes.size() > 0) {
@@ -1603,10 +1603,10 @@ public class InformationWriteQueryController extends BladeController {
     private List<WbsTreeContract> reBuildAncestors(List<WbsTreeContract> list) {
         List<WbsTreeContract> result = new ArrayList<>();
         List<WbsTreeContract> sortedResult = list.stream()
-                .sorted(Comparator.comparing(WbsTreeContract::getType)
-                        .thenComparing(WbsTreeContract::getNodeType)
-                        .thenComparing(WbsTreeContract::getId)
-                        .thenComparing(WbsTreeContract::getCreateTime))
+                .sorted(Comparator.nullsFirst(Comparator.comparing(WbsTreeContract::getType, Comparator.nullsLast(Comparator.naturalOrder())))
+                        .thenComparing(Comparator.nullsFirst(Comparator.comparing(WbsTreeContract::getNodeType, Comparator.nullsLast(Comparator.naturalOrder()))))
+                        .thenComparing(Comparator.nullsFirst(Comparator.comparing(WbsTreeContract::getId, Comparator.nullsLast(Comparator.naturalOrder()))))
+                        .thenComparing(Comparator.nullsFirst(Comparator.comparing(WbsTreeContract::getCreateTime, Comparator.nullsLast(Comparator.naturalOrder())))))
                 .collect(Collectors.toList());
         Map<Long, WbsTreeContract> newMap = BeanUtil.copyProperties(result, WbsTreeContract.class).stream().collect(Collectors.toMap(WbsTreeContract::getId, Function.identity()));
         for (WbsTreeContract obj : sortedResult) {

blade-service/blade-manager/src/main/java/com/mixsmart/utils/StringUtils.java

@@ -1140,9 +1140,11 @@ public class StringUtils {
 		return "";
 	}
 
+/*
 	public static void main(String[] args) {
 		System.out.println(StringUtils.number2String("-2400.0000000000055",1));
 	}
+*/
 
 	/**
 	 * @Description byte数组转Md5字符串