lsm/SqlSugar
1
0
Fork 0
mirror of https://gitee.com/dotnetchina/SqlSugar.git synced 2025-07-15 23:13:42 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Synchronization code

Browse Source
This commit is contained in:
sunkaixuan 2023-10-26 17:08:56 +08:00
parent b0d6a4bb0d
commit b85b5f300d
4 changed files with 69 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Src/Asp.Net/SqlSugar/Abstract/QueryableProvider/NavigatManager.cs
View File

@ -344,6 +344,10 @@ namespace SqlSugar
{ {
ids = ids.Select(it => Convert.ToInt64(it)).Cast<object>().ToList(); ids = ids.Select(it => Convert.ToInt64(it)).Cast<object>().ToList();
} }
if (navPkColumn?.UnderType?.Name == UtilConstants.StringType.Name)
{
ids = ids.Select(it => it?.ToString()?.Replace(",", "[comma]")).Cast<object>().ToList();
}
conditionalModels.Add((new ConditionalModel() conditionalModels.Add((new ConditionalModel()
{ {
ConditionalType = ConditionalType.In, ConditionalType = ConditionalType.In,
@ -415,6 +419,10 @@ namespace SqlSugar
{ {
ids = ids.Select(it => Convert.ToInt64(it)).Cast<object>().ToList(); ids = ids.Select(it => Convert.ToInt64(it)).Cast<object>().ToList();
} }
if (navColumn?.UnderType?.Name == UtilConstants.StringType.Name)
{
ids = ids.Select(it => it?.ToString()?.Replace(",", "[comma]")).Cast<object>().ToList();
}
conditionalModels.Add((new ConditionalModel() conditionalModels.Add((new ConditionalModel()
{ {
ConditionalType = ConditionalType.In, ConditionalType = ConditionalType.In,

4
Src/Asp.Net/SqlSugar/Abstract/SqlBuilderProvider/SqlBuilderProvider_Condition.cs
View File

@ -265,6 +265,10 @@ namespace SqlSugar
{ {
inValue1 = inValue1.Replace("'null'", "null"); inValue1 = inValue1.Replace("'null'", "null");
} }
else if (inValue1.Contains("[comma]"))
{
inValue1 = inValue1.Replace("[comma]", ",");
}
else if (inValue1.Contains("[null]")) else if (inValue1.Contains("[null]"))
{ {
inValue1 = inValue1.Replace("[null]", "null"); inValue1 = inValue1.Replace("[null]", "null");

59
Src/Asp.Net/SqlSugar/Infrastructure/InstanceFactory.cs
View File

@ -11,7 +11,19 @@ namespace SqlSugar
{ {
static Assembly assembly = Assembly.GetExecutingAssembly(); static Assembly assembly = Assembly.GetExecutingAssembly();
static Dictionary<string, Type> typeCache = new Dictionary<string, Type>(); static Dictionary<string, Type> typeCache = new Dictionary<string, Type>();
public static string CustomDllName = ""; private static string _CustomDllName = "";
private static List<string> CustomDlls = new List<string>();
public static string CustomDllName {
get { return _CustomDllName; }
set
{
if (!CustomDlls.Contains(value))
{
CustomDlls.Add(value);
}
_CustomDllName = value;
}
}
public static string CustomDbName = ""; public static string CustomDbName = "";
public static string CustomNamespace = ""; public static string CustomNamespace = "";
public static bool NoCache = false; public static bool NoCache = false;
@ -605,14 +617,30 @@ namespace SqlSugar
internal static Type GetCustomTypeByClass(string className) internal static Type GetCustomTypeByClass(string className)
{ {
var key = "Assembly_"+ CustomDllName+assembly.GetHashCode(); Type type = null;
foreach (var item in CustomDlls.AsEnumerable())
{
if (type == null)
{
type = GetCustomTypeByClass(className, item);
}
if(type != null)
{
break;
}
}
return type;
}
internal static Type GetCustomTypeByClass(string className,string customDllName)
{
var key = "Assembly_" + customDllName + assembly.GetHashCode();
var newAssembly = new ReflectionInoCacheService().GetOrCreate<Assembly>(key, () => { var newAssembly = new ReflectionInoCacheService().GetOrCreate<Assembly>(key, () => {
try try
{ {
var path = Assembly.GetExecutingAssembly().Location; var path = Assembly.GetExecutingAssembly().Location;
if (path.HasValue()) if (path.HasValue())
{ {
path =System.IO.Path.Combine( System.IO.Path.GetDirectoryName(path), CustomDllName + ".dll"); path = System.IO.Path.Combine(System.IO.Path.GetDirectoryName(path), customDllName + ".dll");
} }
if (path.HasValue() && FileHelper.IsExistFile(path)) if (path.HasValue() && FileHelper.IsExistFile(path))
{ {
@ -622,7 +650,7 @@ namespace SqlSugar
{ {
if (IsWebFrom) if (IsWebFrom)
{ {
string newpath = (System.IO.Path.GetDirectoryName(System.Reflection.Assembly.GetExecutingAssembly().GetName().CodeBase) + "\\"+CustomDllName + ".dll").Replace("file:\\", ""); string newpath = (System.IO.Path.GetDirectoryName(System.Reflection.Assembly.GetExecutingAssembly().GetName().CodeBase) + "\\" + CustomDllName + ".dll").Replace("file:\\", "");
return Assembly.LoadFrom(newpath); return Assembly.LoadFrom(newpath);
} }
return Assembly.LoadFrom(CustomDllName + ".dll"); return Assembly.LoadFrom(CustomDllName + ".dll");
@ -638,21 +666,36 @@ namespace SqlSugar
Type type = newAssembly.GetType(className); Type type = newAssembly.GetType(className);
if (type == null) if (type == null)
{ {
type= assembly.GetType(className); type = assembly.GetType(className);
} }
return type; return type;
} }
internal static Type GetCustomTypeByClass<T>(string className) internal static Type GetCustomTypeByClass<T>(string className)
{ {
var key = "Assembly_" + CustomDllName + assembly.GetHashCode(); Type type = null;
foreach (var item in CustomDlls.AsEnumerable())
{
if (type == null)
{
type = GetCustomTypeByClass<T>(className, item);
}
if (type != null)
{
break;
}
}
return type;
}
internal static Type GetCustomTypeByClass<T>(string className,string customDllName)
{
var key = "Assembly_" + customDllName + assembly.GetHashCode();
var newAssembly = new ReflectionInoCacheService().GetOrCreate<Assembly>(key, () => { var newAssembly = new ReflectionInoCacheService().GetOrCreate<Assembly>(key, () => {
try try
{ {
var path = Assembly.GetExecutingAssembly().Location; var path = Assembly.GetExecutingAssembly().Location;
if (path.HasValue()) if (path.HasValue())
{ {
path = System.IO.Path.Combine(System.IO.Path.GetDirectoryName(path), CustomDllName + ".dll"); path = System.IO.Path.Combine(System.IO.Path.GetDirectoryName(path), customDllName + ".dll");
} }
if (path.HasValue() && FileHelper.IsExistFile(path)) if (path.HasValue() && FileHelper.IsExistFile(path))
{ {

2
Src/Asp.Net/SqlSugar/Json2Sql/ModelToSql/FuncModelToSql.cs
View File

@ -97,7 +97,7 @@ namespace SqlSugar
args.Add(new MethodCallExpressionArgs args.Add(new MethodCallExpressionArgs
{ {
MemberName = value, MemberName = value,
MemberValue = value, MemberValue = resPars.FirstOrDefault(it => it.ParameterName == value)?.Value?? value,
IsMember = true IsMember = true
}); });
} }