From db7a0a9394d11c51b478579d6aa24790b7deaa4c Mon Sep 17 00:00:00 2001
From: lazhen <17772815105@139.com>
Date: 星期五, 06 九月 2024 01:18:29 +0800
Subject: [PATCH] Merge branch 'dev' of http://47.101.211.7:10101/r/VWED into dev-zlg

---
 _Main/BL/Type_Archive/StaticMethod_Archive.qbl |   16 +++++++---------
 1 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/_Main/BL/Type_Archive/StaticMethod_Archive.qbl b/_Main/BL/Type_Archive/StaticMethod_Archive.qbl
index 048216a..8969d8c 100644
--- a/_Main/BL/Type_Archive/StaticMethod_Archive.qbl
+++ b/_Main/BL/Type_Archive/StaticMethod_Archive.qbl
@@ -52,16 +52,14 @@
           } else {
             archive.ArchivePPA( relnew, Name := fileName, FilePath := filePath, SourceFileBinaryValue := ppaBinaryValue );
           }
+          
+          // 瀛樻。Curve
+          ac := select( archive, ArchiveCurve, tempAC, true );
+          if ( not isnull( ac ) ) {
+            ac.Delete();
+          }
+          archive.ArchiveCurve( relnew, Name := "濮嬬粓鍙瓨涓�鐗�.xlsx", FilePath := curveFileName, SourceFileBinaryValue := curveBinaryValue );
         }
-      }
-      
-      // 瀛樻。Curve
-      if ( curveFileName <> "" and curveBinaryValue.Size() > 0 ) {
-        ac := select( archive, ArchiveCurve, tempAC, true );
-        if ( not isnull( ac ) ) {
-          ac.Delete();
-        }
-        archive.ArchiveCurve( relnew, Name := "濮嬬粓鍙瓨涓�鐗�.xlsx", FilePath := curveFileName, SourceFileBinaryValue := curveBinaryValue );
       }
     }
   *]

--
Gitblit v1.9.3