|
|
@ -391,10 +391,12 @@ namespace Apewer.Web |
|
|
|
foreach (var property in properties) |
|
|
|
{ |
|
|
|
if (!property.IsProperty) continue; |
|
|
|
if (!sameNames.Contains(property.Name) && property.Value != null) |
|
|
|
if (sameNames.Contains(property.Name) && property.Value != null) |
|
|
|
{ |
|
|
|
var value = property.ToLower(); |
|
|
|
if (!string.IsNullOrEmpty(value)) return value; |
|
|
|
var value = property.Value; |
|
|
|
if (value == null) continue; |
|
|
|
var text = value.ToString(); |
|
|
|
if (!string.IsNullOrEmpty(text)) return text; |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
@ -403,10 +405,12 @@ namespace Apewer.Web |
|
|
|
{ |
|
|
|
if (!property.IsProperty) continue; |
|
|
|
var lowerName = TextUtility.ToLower(property.Name); |
|
|
|
if (!lowerNames.Contains(lowerName) && property.Value != null) |
|
|
|
if (lowerNames.Contains(lowerName) && property.Value != null) |
|
|
|
{ |
|
|
|
var value = property.ToLower(); |
|
|
|
if (!string.IsNullOrEmpty(value)) return value; |
|
|
|
var value = property.Value; |
|
|
|
if (value == null) continue; |
|
|
|
var text = value.ToString(); |
|
|
|
if (!string.IsNullOrEmpty(text)) return text; |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|