Merge branch 'net5.0'

2022-05-09 20:20:21 +08:00
parent 7e9f9301ff f6ded6ce36
commit f741d7a7bf
6 changed files with 39 additions and 12 deletions
--- a/ZR.Service/System/GenTableService.cs
+++ b/ZR.Service/System/GenTableService.cs
@@ -60,7 +60,10 @@ namespace ZR.Service.System
            if (info != null && !info.SubTableName.IsEmpty())
            {
                info.SubTable = GenTableRepository.Queryable().Where(f => f.SubTableName == info.TableName).First();
-                SetTableFromOptions(info?.SubTable);
+                if (info?.SubTable != null)
+                {
+                    SetTableFromOptions(info?.SubTable);
+                }
            }
            return info;
        }