检查内容名称截取优化

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

@@ -324,10 +324,10 @@ public class FormulaUtils {
             ,"基底承载力(KPa)_不小于设计_实测值或实测偏差值"
     );
 
-    public static void main(String[] args) {
+/*    public static void main(String[] args) {
        // itemNames.stream().map(FormulaUtils::parseItemName).forEach(System.out::println);
        itemNames.stream().map(FormulaUtils::checkItemName).forEach(System.out::println);
-    }
+    }*/
 
 
 

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

@@ -2137,7 +2137,7 @@ public class ExcelTabController extends BladeController {
                         R bussDataInfo = this.excelTabService.getBussDataInfo(pk, 1);
                         @SuppressWarnings("unchecked")
                         Map<String, Object> jo = (Map<String, Object>) bussDataInfo.getData();
-                        if (jo != null && ObjectUtils.isNotEmpty(jo)) {
+                        if (ObjectUtils.isNotEmpty(jo)) {
                             jo.put("pkeyId", pk);
                             extra.add(jo);
                         }