diff --git a/src/CADShared/ExtensionMethod/Jig/JigEx.cs b/src/CADShared/ExtensionMethod/Jig/JigEx.cs
index 7289922e0f2dbc90f43566a5c695c6442c801891..84fe2497835e1a012cfa11e5c700622e4c094285 100644
--- a/src/CADShared/ExtensionMethod/Jig/JigEx.cs
+++ b/src/CADShared/ExtensionMethod/Jig/JigEx.cs
@@ -1,4 +1,4 @@
-#if a2024 || zcad
+#if a2024 || zcad
 using ArgumentNullException = IFoxCAD.Basal.ArgumentNullEx;
 
 // ReSharper disable ClassWithVirtualMembersNeverInherited.Global
@@ -371,7 +371,7 @@ protected virtual void Dispose(bool disposing)
             // 最后一次的图元如果没有加入数据库,就在此销毁,所以JigEx调用的时候加using
             _drawEntities.ForEach(ent =>
             {
-                if (ent.Database == null && !ent.IsDisposed)
+                if (!ent.IsDisposed && ent.Database == null)
                     ent.Dispose();
             });
         }