From 5c23d0c45e546cba61dd0d7c97f72a3c2db29a95 Mon Sep 17 00:00:00 2001 From: "fly.li" Date: Mon, 13 Sep 2021 14:57:36 +0800 Subject: [PATCH] =?UTF-8?q?REPORT-55243:=E4=BF=AE=E6=94=B9=E6=95=B4?= =?UTF-8?q?=E5=9E=8B=E6=95=B0=E5=AD=97=E4=B8=BA=E5=B8=B8=E9=87=8F=EF=BC=8C?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AF=B9cpt=E5=92=8Ccptx=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E5=90=8E=E7=BC=80=E7=9A=84=E5=88=A4=E6=96=AD=E6=96=B9=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fr/nx/app/designer/utils/CptAndCptxCompatibilityUtil.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/designer-base/src/main/java/com/fr/nx/app/designer/utils/CptAndCptxCompatibilityUtil.java b/designer-base/src/main/java/com/fr/nx/app/designer/utils/CptAndCptxCompatibilityUtil.java index 63cab6c3e..2e08a8ae9 100644 --- a/designer-base/src/main/java/com/fr/nx/app/designer/utils/CptAndCptxCompatibilityUtil.java +++ b/designer-base/src/main/java/com/fr/nx/app/designer/utils/CptAndCptxCompatibilityUtil.java @@ -22,7 +22,7 @@ public class CptAndCptxCompatibilityUtil { FILE editingFILE = jTemplate.getEditingFILE(); String path = editingFILE.getPath(); //只有在旧文件是cptx文件并且新文件是cpt文件时才会改变报表引擎属性 - boolean isCptxConvertToCpt = oldName.endsWith(".cptx") && path.endsWith(".cpt"); + boolean isCptxConvertToCpt = FileExtension.CPTX.matchExtension(oldName) && FileExtension.CPT.matchExtension(path); if (isCptxConvertToCpt && !changeFrEngineAttr(jTemplate)){ isCptxConvertToCpt = false; } @@ -83,6 +83,6 @@ public class CptAndCptxCompatibilityUtil { } private static boolean isEngineXEnable(LayerReportAttr layerReportAttr, String fileName){ - return (layerReportAttr!= null && layerReportAttr.isClientPaging() && layerReportAttr.getEngineState() == 0) || FileExtension.CPTX.matchExtension(fileName); + return (layerReportAttr!= null && layerReportAttr.isClientPaging() && layerReportAttr.getEngineState() == LayerReportAttr.ENGINE_X) || FileExtension.CPTX.matchExtension(fileName); } }