Synchronization code

This commit is contained in:
sunkaixuan
2022-10-20 09:23:22 +08:00
parent 150915a594
commit 7c84f68e4b

View File

@@ -909,9 +909,9 @@ namespace SqlSugar
{
conditionalModel = new ConditionalModel()
{
ConditionalType = (ConditionalType)Convert.ToInt32(value["ConditionalType"].Value<int>()),
ConditionalType = GetConditionalType(value),
FieldName = value["FieldName"] + "",
CSharpTypeName= value["CSharpTypeName"].ObjToString().IsNullOrEmpty()? null : value["CSharpTypeName"].ObjToString(),
CSharpTypeName = value["CSharpTypeName"].ObjToString().IsNullOrEmpty() ? null : value["CSharpTypeName"].ObjToString(),
FieldValue = value["FieldValue"].Value<string>() == null ? null : value["FieldValue"].ToString()
};
}
@@ -919,5 +919,18 @@ namespace SqlSugar
}
return result;
}
private static ConditionalType GetConditionalType(JToken value)
{
if (value["ConditionalType"].Type == JTokenType.String)
{
var stringValue = value["ConditionalType"].Value<string>();
if (!stringValue.IsInt())
{
return (ConditionalType)Enum.Parse(typeof(ConditionalType), stringValue);
}
}
return (ConditionalType)Convert.ToInt32(value["ConditionalType"].Value<int>());
}
}
}