浏览代码

Merge commit 'refs/pull/345/head' of https://gitee.com/zuohuaijun/Admin.NET into next

zuohuaijun 4 年之前
父节点
当前提交
c6d5a00c5d
共有 1 个文件被更改,包括 12 次插入2 次删除
  1. 12 2
      Admin.NET/Admin.NET.Core/Extension/ObjectExtension.cs

+ 12 - 2
Admin.NET/Admin.NET.Core/Extension/ObjectExtension.cs

@@ -122,7 +122,17 @@ public static class ObjectExtension
     /// <returns></returns>
     /// <returns></returns>
     private static bool IsIgnoreColumn(PropertyInfo pi)
     private static bool IsIgnoreColumn(PropertyInfo pi)
     {
     {
-        var sc = pi.GetCustomAttributes<SugarColumn>(false).FirstOrDefault(u => u.IsIgnore == true);
-        return sc != null;
+        foreach (var attr in pi.GetCustomAttributes())
+        {
+            if (attr is SugarColumn sAttr && sAttr.IsIgnore)
+            {
+                return true;
+            }
+            if (attr is Navigate)
+            {
+                return true;
+            }
+        }
+        return false;
     }
     }
 }
 }