From c71a1ac798ff5dac0694a8f0daa3fae9aedd482c Mon Sep 17 00:00:00 2001 From: sunkaixuan <610262374@qq.com> Date: Tue, 13 Aug 2024 19:24:17 +0800 Subject: [PATCH] =?UTF-8?q?Update=20=E4=BA=BA=E5=A4=A7=E9=87=91=E4=BB=93[S?= =?UTF-8?q?qlServer]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SqlSugar/Abstract/SugarProvider/SqlSugarProvider.cs | 6 +++++- .../ResolveItems/MethodCallExpressionResolve.cs | 4 ++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/Src/Asp.NetCore2/SqlSugar/Abstract/SugarProvider/SqlSugarProvider.cs b/Src/Asp.NetCore2/SqlSugar/Abstract/SugarProvider/SqlSugarProvider.cs index d2cce89ea..d5b314a37 100644 --- a/Src/Asp.NetCore2/SqlSugar/Abstract/SugarProvider/SqlSugarProvider.cs +++ b/Src/Asp.NetCore2/SqlSugar/Abstract/SugarProvider/SqlSugarProvider.cs @@ -653,8 +653,12 @@ namespace SqlSugar { return resulut.Select("unionTable.*"); } - else + else if (this.Context.CurrentConnectionConfig?.MoreSettings?.IsWithNoLockQuery==true) { + return resulut.Select(sqlBuilder.SqlSelectAll).With(SqlWith.Null); + } + else + { return resulut.Select(sqlBuilder.SqlSelectAll); } } diff --git a/Src/Asp.NetCore2/SqlSugar/ExpressionsToSql/ResolveItems/MethodCallExpressionResolve.cs b/Src/Asp.NetCore2/SqlSugar/ExpressionsToSql/ResolveItems/MethodCallExpressionResolve.cs index 5e2c554bd..02bf0e8bf 100644 --- a/Src/Asp.NetCore2/SqlSugar/ExpressionsToSql/ResolveItems/MethodCallExpressionResolve.cs +++ b/Src/Asp.NetCore2/SqlSugar/ExpressionsToSql/ResolveItems/MethodCallExpressionResolve.cs @@ -134,6 +134,10 @@ namespace SqlSugar } var value = GetNewExpressionValue(express.Object); var dateString2 = this.Context.DbMehtods.GetDateString(value, format); + if (IsSqlServerModel()) + { + dateString2= string.Format("FORMAT({0},'{1}','en-US')", value, format); + } if (dateString2 == null) { var dateString = GeDateFormat(format, value);