Merge remote-tracking branch 'origin/test-merge' into test-merge

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

@@ -240,7 +240,7 @@ public class FormulaServiceImpl extends BaseServiceImpl<FormulaMapper, Formula>
             tec.constantMap.put(TABLE_LIST, tableList);
 
             /*监表质量附件，过滤掉隐藏表格*/
-            tec.constantMap.put("tableNames", tableList.stream().filter(e -> StringUtils.isEquals(e.getIsBussShow(), 1) && StringUtils.isNotEquals(e.getTableType(), 4)).map(WbsTreeContract::getNodeName).collect(Collectors.toList()));
+            tec.constantMap.put("tableNames", tableList.stream().filter(e -> (e.getIsBussShow() == null || StringUtils.isEquals(e.getIsBussShow(), 1)) && StringUtils.isNotEquals(e.getTableType(), 4)).map(WbsTreeContract::getNodeName).collect(Collectors.toList()));
 
         }
     }