mirror of
https://gitee.com/dotnetchina/SqlSugar.git
synced 2025-04-05 17:37:58 +08:00
Synchronization code
This commit is contained in:
parent
20782a96ae
commit
d8abcc1f55
@ -7,7 +7,11 @@ namespace SqlSugar
|
||||
{
|
||||
public class SelectModel
|
||||
{
|
||||
public object FiledName { get; set; }
|
||||
public object FieldName { get; set; }
|
||||
|
||||
[Obsolete("名字拼错使用FieldName")]
|
||||
public object FiledName { get { return FieldName; } set { FieldName = value; } }
|
||||
|
||||
public string AsName { get; set; }
|
||||
|
||||
public static List<SelectModel> Create(params SelectModel[] SelectModels)
|
||||
|
@ -22,7 +22,7 @@ namespace SqlSugar
|
||||
}
|
||||
else if (IsString(item))
|
||||
{
|
||||
conditionalModels.Add(new SelectModel() { FiledName = item.ObjToString().ToCheckField(), AsName = item.ObjToString().Replace(".", "_") });
|
||||
conditionalModels.Add(new SelectModel() { FieldName = item.ObjToString().ToCheckField(), AsName = item.ObjToString().Replace(".", "_") });
|
||||
}
|
||||
else if (IsArraySingleItem(item))
|
||||
{
|
||||
@ -34,7 +34,7 @@ namespace SqlSugar
|
||||
}
|
||||
conditionalModels.Add(new SelectModel()
|
||||
{
|
||||
FiledName = fileName,
|
||||
FieldName = fileName,
|
||||
AsName = asName
|
||||
});
|
||||
|
||||
@ -49,7 +49,7 @@ namespace SqlSugar
|
||||
}
|
||||
conditionalModels.Add(new SelectModel()
|
||||
{
|
||||
FiledName = fileName,
|
||||
FieldName = fileName,
|
||||
AsName = asName
|
||||
});
|
||||
|
||||
@ -58,7 +58,7 @@ namespace SqlSugar
|
||||
{
|
||||
conditionalModels.Add(new SelectModel()
|
||||
{
|
||||
FiledName = item.ObjToString().Trim(),
|
||||
FieldName = item.ObjToString().Trim(),
|
||||
AsName = item.ObjToString().Trim()
|
||||
});
|
||||
}
|
||||
|
@ -17,7 +17,7 @@ namespace SqlSugar
|
||||
{
|
||||
var orderByModel = item as SelectModel;
|
||||
orderByModel.AsName=GetAsName(orderByModel);
|
||||
orderByModel.FiledName = GetSqlPart(orderByModel.FiledName, pars).ObjToString();
|
||||
orderByModel.FieldName = GetSqlPart(orderByModel.FieldName, pars).ObjToString();
|
||||
AppendFiledName(sql, orderByModel);
|
||||
}
|
||||
else
|
||||
@ -32,7 +32,7 @@ namespace SqlSugar
|
||||
{
|
||||
if (orderByModel.AsName.IsNullOrEmpty())
|
||||
{
|
||||
orderByModel.AsName = orderByModel.FiledName.ObjToString();
|
||||
orderByModel.AsName = orderByModel.FieldName.ObjToString();
|
||||
}
|
||||
if (orderByModel.AsName.StartsWith(UtilConstants.ReplaceKey))
|
||||
{
|
||||
@ -48,7 +48,7 @@ namespace SqlSugar
|
||||
|
||||
private void AppendFiledName(StringBuilder sql, SelectModel orderByModel)
|
||||
{
|
||||
sql.Append($" {orderByModel.FiledName} AS {orderByModel.AsName} ,");
|
||||
sql.Append($" {orderByModel.FieldName} AS {orderByModel.AsName} ,");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -39,10 +39,10 @@ namespace SqlSugar
|
||||
List<SelectModel> result = new List<SelectModel>();
|
||||
foreach (var item in obj)
|
||||
{
|
||||
if (item.FiledName is string)
|
||||
if (item.FieldName is string)
|
||||
{
|
||||
var tableName = GetTableName(item.FiledName + "");
|
||||
var columnName = GetColumnName(item.FiledName + "");
|
||||
var tableName = GetTableName(item.FieldName + "");
|
||||
var columnName = GetColumnName(item.FieldName + "");
|
||||
if (IsMyColums(tableName, columnName))
|
||||
{
|
||||
result.Add(item);
|
||||
|
Loading…
Reference in New Issue
Block a user