yangyj преди 1 година
родител
ревизия
26e8238daf
променени са 1 файла, в които са добавени 2 реда и са изтрити 2 реда
  1. 2 2
      blade-service/blade-manager/src/main/java/org/springblade/manager/service/impl/FormulaServiceImpl.java

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

@@ -276,8 +276,8 @@ public class FormulaServiceImpl extends BaseServiceImpl<FormulaMapper, Formula>
                                 if (op.isPresent()) {
                                     g = op.get();
                                 }
-                            }
-                            if (g == null) {
+                            }else{
+                                /*只有不存在配置的前提下才能尝试自动匹配*/
                                 Optional<ElementBlock> op = elementBlockList.stream().filter(w -> FormulaUtils.similarity(w.getEName(), t.getPoint()) > 0.3).max(Comparator.comparingDouble((ElementBlock b) -> FormulaUtils.similarity(b.getEName(), t.getPoint())));
                                 /*相似匹配*/
                                 if (op.isPresent()) {