mirror of
https://gitee.com/dotnetchina/SqlSugar.git
synced 2025-06-28 13:34:32 +08:00
修复codefirst从xml读取属性注释时没有读取父属性注释,导致数据库表有的字段有注释有的没有注释。
This commit is contained in:
parent
2f284a20c3
commit
0d1aa38d92
@ -234,14 +234,15 @@ namespace SqlSugar
|
|||||||
/// <returns>the code annotation for the field</returns>
|
/// <returns>the code annotation for the field</returns>
|
||||||
public string GetPropertyAnnotation(Type entityType, string dbColumnName)
|
public string GetPropertyAnnotation(Type entityType, string dbColumnName)
|
||||||
{
|
{
|
||||||
if (entityType.IsClass() == false)
|
if (entityType.IsClass() == false || entityType == typeof(object))
|
||||||
{
|
{
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
var result = GetXElementNodeValue(entityType, $"P:{entityType.FullName}.{dbColumnName}");
|
var result = GetXElementNodeValue(entityType, $"P:{entityType.FullName}.{dbColumnName}");
|
||||||
if (string.IsNullOrEmpty(result))
|
if (string.IsNullOrEmpty(result))
|
||||||
{
|
{
|
||||||
return null;
|
return GetPropertyAnnotation(entityType.BaseType, dbColumnName);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
@ -234,14 +234,15 @@ namespace SqlSugar
|
|||||||
/// <returns>the code annotation for the field</returns>
|
/// <returns>the code annotation for the field</returns>
|
||||||
public string GetPropertyAnnotation(Type entityType, string dbColumnName)
|
public string GetPropertyAnnotation(Type entityType, string dbColumnName)
|
||||||
{
|
{
|
||||||
if (entityType.IsClass() == false)
|
if (entityType.IsClass() == false || entityType == typeof(object))
|
||||||
{
|
{
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
var result = GetXElementNodeValue(entityType, $"P:{entityType.FullName}.{dbColumnName}");
|
var result = GetXElementNodeValue(entityType, $"P:{entityType.FullName}.{dbColumnName}");
|
||||||
if (string.IsNullOrEmpty(result))
|
if (string.IsNullOrEmpty(result))
|
||||||
{
|
{
|
||||||
return null;
|
return GetPropertyAnnotation(entityType.BaseType, dbColumnName);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
Loading…
Reference in New Issue
Block a user