From 2a4926352b797fcd873664c544bc79ad2e3051e8 Mon Sep 17 00:00:00 2001 From: sunkaixuan <610262374@qq.com> Date: Mon, 8 Jan 2024 16:22:45 +0800 Subject: [PATCH] Synchronization code --- .../SqlSugar/Abstract/SqlBuilderProvider/QueryBuilder.cs | 4 ++++ .../SqlSugar/Abstract/SugarProvider/SqlSugarAccessory.cs | 2 +- Src/Asp.NetCore2/SqlSugar/Enum/JoinType.cs | 3 ++- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/Src/Asp.NetCore2/SqlSugar/Abstract/SqlBuilderProvider/QueryBuilder.cs b/Src/Asp.NetCore2/SqlSugar/Abstract/SqlBuilderProvider/QueryBuilder.cs index c56abbbea..17f36d672 100644 --- a/Src/Asp.NetCore2/SqlSugar/Abstract/SqlBuilderProvider/QueryBuilder.cs +++ b/Src/Asp.NetCore2/SqlSugar/Abstract/SqlBuilderProvider/QueryBuilder.cs @@ -681,6 +681,10 @@ namespace SqlSugar var entityInfo = this.Context.EntityMaintenance.GetEntityInfoWithAttr(joinInfo.EntityType); result = $" {result} AND {shortName}.{UtilMethods.GetDiscrimator(entityInfo,this.Builder)}"; } + if (joinInfo.JoinType == JoinType.Cross) + { + result = result.Replace(" ON ", " WHERE "); + } return result; } public virtual void Clear() diff --git a/Src/Asp.NetCore2/SqlSugar/Abstract/SugarProvider/SqlSugarAccessory.cs b/Src/Asp.NetCore2/SqlSugar/Abstract/SugarProvider/SqlSugarAccessory.cs index 7ece2aaf8..f3ef43926 100644 --- a/Src/Asp.NetCore2/SqlSugar/Abstract/SugarProvider/SqlSugarAccessory.cs +++ b/Src/Asp.NetCore2/SqlSugar/Abstract/SugarProvider/SqlSugarAccessory.cs @@ -585,7 +585,7 @@ namespace SqlSugar { ++i; var isLast = joinArray.Length == i; - var isJoinType = item.IsIn(JoinType.Full.ToString(),JoinType.Inner.ToString(), JoinType.Left.ToString(), JoinType.Right.ToString()); + var isJoinType = item.IsIn(JoinType.Full.ToString(),JoinType.Inner.ToString(), JoinType.Left.ToString(), JoinType.Right.ToString(),JoinType.Cross.ToString()); if (isJoinType) { if (joinValue != null) diff --git a/Src/Asp.NetCore2/SqlSugar/Enum/JoinType.cs b/Src/Asp.NetCore2/SqlSugar/Enum/JoinType.cs index aa519b3d5..2cf78f899 100644 --- a/Src/Asp.NetCore2/SqlSugar/Enum/JoinType.cs +++ b/Src/Asp.NetCore2/SqlSugar/Enum/JoinType.cs @@ -10,6 +10,7 @@ namespace SqlSugar Inner = 0, Left = 1, Right = 2, - Full=3 + Full=3, + Cross } }