fix #71

Author: Ahoo-Wang

build/version.props

@@ -2,7 +2,7 @@
 	<PropertyGroup>
 		<VersionMajor>4</VersionMajor>
 		<VersionMinor>0</VersionMinor>
-		<VersionPatch>58</VersionPatch>
+		<VersionPatch>59</VersionPatch>
 		<VersionPrefix>$(VersionMajor).$(VersionMinor).$(VersionPatch)</VersionPrefix>
 	</PropertyGroup>
 </Project>

src/SmartSql/Configuration/Tags/Switch.cs

@@ -8,29 +8,39 @@ public class Switch : Tag
         public override bool IsCondition(AbstractRequestContext context)
         {
             EnsurePropertyValue(context);
-            return true;
+            var matchedTag = GetMatchedTag(context);
+            return matchedTag != null;
         }
+
         public override void BuildSql(AbstractRequestContext context)
+        {
+            var matchedTag = GetMatchedTag(context);
+            matchedTag?.BuildSql(context);
+        }
+
+        private ITag GetMatchedTag(AbstractRequestContext context)
         {
             var matchedTag = ChildTags.FirstOrDefault(tag =>
             {
                 if (tag is Case caseTag)
                 {
                     return caseTag.IsCondition(context);
                 }
+
                 return false;
             }) ?? ChildTags.FirstOrDefault(tag => tag is Default);
-
-            matchedTag?.BuildSql(context);
-
+            return matchedTag;
         }
 
         public class Case : StringCompareTag
         {
             public override bool IsCondition(AbstractRequestContext context)
             {
                 var reqVal = EnsurePropertyValue(context);
-                if (reqVal == null) { return false; }
+                if (reqVal == null)
+                {
+                    return false;
+                }
 
                 var reqValStr = reqVal is Enum ? Convert.ToInt64(reqVal).ToString() : reqVal.ToString();
                 return reqValStr.Equals(CompareValue);
@@ -45,4 +55,4 @@ public override bool IsCondition(AbstractRequestContext context)
             }
         }
     }
-}
+}