Browse Source

后管元素识别保存非空判断

lvy 1 month ago
parent
commit
8ebbbd851d

+ 1 - 1
blade-service/blade-manager/src/main/java/org/springblade/manager/controller/ExctabCellController.java

@@ -125,7 +125,7 @@ public class ExctabCellController extends BladeController {
                 continue;
             }
             if (exctabCell.getTextInfo().equals(info.getEName())
-                    && (!exctabCell.getTextElementType().equals(info.getEType()) || !exctabCell.getTextDeviation().equals(info.getEAllowDeviation()))) {
+                    && ((exctabCell.getTextElementType() != null && !exctabCell.getTextElementType().equals(info.getEType())) || (exctabCell.getTextDeviation()!= null && !exctabCell.getTextDeviation().equals(info.getEAllowDeviation())))) {
                 //修改对应关联的元素表中的元素信息
                 info.setEType(exctabCell.getTextElementType());
                 info.setEAllowDeviation(exctabCell.getTextDeviation());