From 8375ae6862ad9b0d97c386c45c671e34b58053cb Mon Sep 17 00:00:00 2001 From: sunkaixuan <610262374@qq.com> Date: Mon, 2 Jan 2023 19:57:31 +0800 Subject: [PATCH] Synchronization code --- Src/Asp.NetCore2/SqlSugar/Realization/Dm/DmProvider.cs | 10 +++++++--- .../SqlSugar/Realization/Oracle/OracleProvider.cs | 10 +++++++--- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/Src/Asp.NetCore2/SqlSugar/Realization/Dm/DmProvider.cs b/Src/Asp.NetCore2/SqlSugar/Realization/Dm/DmProvider.cs index dd643825f..a9e67182f 100644 --- a/Src/Asp.NetCore2/SqlSugar/Realization/Dm/DmProvider.cs +++ b/Src/Asp.NetCore2/SqlSugar/Realization/Dm/DmProvider.cs @@ -26,15 +26,19 @@ namespace SqlSugar { if (item.Value != null && item.Value.IndexOf(",") == 1 && Regex.IsMatch(item.Value, @"^ \,\@\w+$")) { - break; + continue; } else if (item.Value != null && Regex.IsMatch(item.Value.Trim(), @"^\w+\,\@\w+\,$")) { - break; + continue; } else if (item.Value != null && item.Value.ObjToString().Contains("||") && Regex.IsMatch(item.Value.Replace(" ", "").Trim(), @"\|\|@\w+\|\|")) { - break; + continue; + } + else if (item.Value != null && Regex.IsMatch(item.Value.Replace(" ", "").Trim(), @"\(\@\w+\,")) + { + continue; } sql = sql.Replace(item.Value, item.Value.Replace("@", UtilConstants.ReplaceKey)); } diff --git a/Src/Asp.NetCore2/SqlSugar/Realization/Oracle/OracleProvider.cs b/Src/Asp.NetCore2/SqlSugar/Realization/Oracle/OracleProvider.cs index d04fde52f..35e1f27a3 100644 --- a/Src/Asp.NetCore2/SqlSugar/Realization/Oracle/OracleProvider.cs +++ b/Src/Asp.NetCore2/SqlSugar/Realization/Oracle/OracleProvider.cs @@ -23,15 +23,19 @@ namespace SqlSugar { if (item.Value != null && item.Value.IndexOf(",") == 1&&Regex.IsMatch(item.Value, @"^ \,\@\w+$")) { - break; + continue; } else if (item.Value != null &&Regex.IsMatch(item.Value.Trim(), @"^\w+\,\@\w+\,$")) { - break; + continue; } else if (item.Value != null && item.Value.ObjToString().Contains("||") && Regex.IsMatch(item.Value.Replace(" ","").Trim(), @"\|\|@\w+\|\|")) { - break; + continue; + } + else if (item.Value != null&& Regex.IsMatch(item.Value.Replace(" ", "").Trim(), @"\(\@\w+\,")) + { + continue; } sql = sql.Replace(item.Value, item.Value.Replace("@", UtilConstants.ReplaceKey)); }