From 9c19067b5006c7ebccf1a02e6d12a81fb1a72e4b Mon Sep 17 00:00:00 2001
From: sunkaixuan <610262374@qq.com>
Date: Mon, 16 Oct 2023 20:14:06 +0800
Subject: [PATCH] Synchronization code

---
 .../ResolveItems/BinaryExpressionResolve.cs         | 13 +++++++++----
 Src/Asp.NetCore2/SqlSugar/SqlSugarForCore.nuspec    |  2 +-
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/Src/Asp.Net/SqlSugar/ExpressionsToSql/ResolveItems/BinaryExpressionResolve.cs b/Src/Asp.Net/SqlSugar/ExpressionsToSql/ResolveItems/BinaryExpressionResolve.cs
index f027eca57..d00725813 100644
--- a/Src/Asp.Net/SqlSugar/ExpressionsToSql/ResolveItems/BinaryExpressionResolve.cs
+++ b/Src/Asp.Net/SqlSugar/ExpressionsToSql/ResolveItems/BinaryExpressionResolve.cs
@@ -85,10 +85,15 @@ namespace SqlSugar
 
                 var leftChild = ExpressionTool.RemoveConvert((left as BinaryExpression).Right);
                 var rightChild = ExpressionTool.RemoveConvert((right as BinaryExpression).Right);
-                if (ExpressionTool.GetMethodName(leftChild)=="Select"
-                    && ExpressionTool.GetMethodName(rightChild) == "Select"
-                    && ExpressionTool.ContainsMethodName(left as BinaryExpression, "Group")
-                    &&ExpressionTool.ContainsMethodName(right as BinaryExpression, "Group")) 
+                var isLeftSelect = ExpressionTool.GetMethodName(leftChild) == "Select";
+                var isRightSelect = ExpressionTool.GetMethodName(rightChild) == "Select";
+                var isLeftGroup = ExpressionTool.ContainsMethodName(left as BinaryExpression, "Group");
+                var isRightGroup = ExpressionTool.ContainsMethodName(right as BinaryExpression, "Group");
+                if ( 
+                     (isLeftSelect && isLeftGroup)
+                     || 
+                     (isRightSelect && isRightGroup) 
+                 ) 
                 {
                     return true;
                 }
diff --git a/Src/Asp.NetCore2/SqlSugar/SqlSugarForCore.nuspec b/Src/Asp.NetCore2/SqlSugar/SqlSugarForCore.nuspec
index 5607ada1a..9d016bc4a 100644
--- a/Src/Asp.NetCore2/SqlSugar/SqlSugarForCore.nuspec
+++ b/Src/Asp.NetCore2/SqlSugar/SqlSugarForCore.nuspec
@@ -2,7 +2,7 @@
 <package >
   <metadata>
     <id>SqlSugarCore</id>
-    <version>5.1.4.111-preview04</version>
+    <version>5.1.4.111-preview20</version>
     <authors>sunkaixuan</authors>
     <owners>果糖大数据科技</owners>
     <licenseUrl>http://www.apache.org/licenses/LICENSE-2.0.html</licenseUrl>