From e9b026ea885d8460b440a10ecd1f654bd0211650 Mon Sep 17 00:00:00 2001
From: "fly.li" <Fly.Li@fanruan.com>
Date: Thu, 2 Sep 2021 19:45:42 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-55243=EF=BC=9A=E5=A6=82=E6=9E=9C?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E6=8A=A5=E8=A1=A8=E5=BC=95=E6=93=8E?=
 =?UTF-8?q?=E5=B1=9E=E6=80=A7=EF=BC=8C=E5=88=99=E8=BF=94=E5=9B=9E=E5=B8=83?=
 =?UTF-8?q?=E5=B0=94=E5=80=BC=EF=BC=8C=E4=BB=A5=E5=88=A4=E6=96=AD=E6=98=AF?=
 =?UTF-8?q?=E5=90=A6=E9=9C=80=E8=A6=81=E9=87=8D=E6=96=B0=E9=A2=84=E7=BC=96?=
 =?UTF-8?q?=E8=AF=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/fr/nx/app/designer/utils/CptCompileUtil.java  | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/designer-base/src/main/java/com/fr/nx/app/designer/utils/CptCompileUtil.java b/designer-base/src/main/java/com/fr/nx/app/designer/utils/CptCompileUtil.java
index f6dce92b4c..1d76a71d1c 100644
--- a/designer-base/src/main/java/com/fr/nx/app/designer/utils/CptCompileUtil.java
+++ b/designer-base/src/main/java/com/fr/nx/app/designer/utils/CptCompileUtil.java
@@ -45,6 +45,7 @@ public class CptCompileUtil {
         }
         TransformResultInfo resultInfo = compile0(workbook, file);
         unSupportLog(resultInfo);
+
     }
 
     public static TransformResultInfo compile0(WorkBook workbook, FILE file) {
@@ -137,11 +138,12 @@ public class CptCompileUtil {
     /*
      * 该另存为流程会改变文件内容，现在作为兼容的流程，以后可以随时删除该流程
      * */
-    public static void changeFrEngineAttr(String oldName, JTemplate jTemplate){
+    public static boolean changeFrEngineAttr(String oldName, JTemplate jTemplate){
         FILE editingFILE = jTemplate.getEditingFILE();
         String path = editingFILE.getPath();
         //只有在旧文件是cptx文件并且新文件是cpt文件时才会改变报表引擎属性
-        if (oldName.endsWith(".cptx") && path.endsWith(".cpt")){
+        boolean isChange = oldName.endsWith(".cptx") && path.endsWith(".cpt");
+        if (isChange){
             WorkBook target = (WorkBook)jTemplate.getTarget();
             WorkSheet workSheet = (WorkSheet)target.getReport(0);
             LayerReportAttr layerReportAttr = workSheet.getLayerReportAttr();
@@ -152,6 +154,7 @@ public class CptCompileUtil {
             layerReportAttr.setClientPaging(true);
             layerReportAttr.setNewEngine(true);
         }
+        return isChange;
     }
 
     public static boolean isNewEngine(Object workBook){