Просмотр исходного кода

修改评定表在不存在配置的情况下自动匹配条件

lvy 1 неделя назад
Родитель
Сommit
4b0f232398

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

@@ -426,11 +426,13 @@ public class FormulaServiceImpl extends BaseServiceImpl<FormulaMapper, Formula>
                                     }
                                 }
                             } 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()) {
-                                    g = op.get();
+                                /*只有不存在配置的前提下才能尝试自动匹配(只有宝北路项目执行这个)*/
+                                if (tec.getCurrentNode() != null && tec.getCurrentNode().getProjectId() == 1630011899725201410L) {
+                                    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()) {
+                                        g = op.get();
+                                    }
                                 }
                             }
                             if (g != null) {