diff --git a/XCode/Code/EntityBuilder.cs b/XCode/Code/EntityBuilder.cs
index 4a4e1cf4b..126ce8be9 100644
--- a/XCode/Code/EntityBuilder.cs
+++ b/XCode/Code/EntityBuilder.cs
@@ -1685,7 +1685,7 @@ protected virtual Boolean BuildExtendFind(IDataColumn[] columns, Int32 index)
foreach (var dc in columns)
{
if (dc.DataType != null && dc.DataType.IsInt())
- WriteLine("if ({0} <= 0) return null;", dc.CamelName());
+ WriteLine("if ({0} < 0) return null;", dc.CamelName());
else if (dc.DataType == typeof(String))
{
if (nullable && dc.Nullable)
@@ -1787,7 +1787,7 @@ protected virtual Boolean BuildExtendFindAll(IDataColumn[] columns, Int32 index)
foreach (var dc in columns)
{
if (dc.DataType != null && dc.DataType.IsInt())
- WriteLine("if ({0} <= 0) return [];", dc.CamelName(), ClassName);
+ WriteLine("if ({0} < 0) return [];", dc.CamelName(), ClassName);
else if (dc.DataType == typeof(String))
{
if (Option.Nullable && dc.Nullable)
diff --git a/XCode/Membership/xcodetool.exe b/XCode/Membership/xcodetool.exe
index 73be8fc7b..48abd79b2 100644
Binary files a/XCode/Membership/xcodetool.exe and b/XCode/Membership/xcodetool.exe differ
diff --git "a/XUnitTest.XCode/Code/Entity/\345\234\260\345\214\272.cs" "b/XUnitTest.XCode/Code/Entity/\345\234\260\345\214\272.cs"
index ed70b3698..c51b90b02 100644
--- "a/XUnitTest.XCode/Code/Entity/\345\234\260\345\214\272.cs"
+++ "b/XUnitTest.XCode/Code/Entity/\345\234\260\345\214\272.cs"
@@ -266,7 +266,7 @@ public override Object? this[String name]
/// 实体对象
public static Area? FindByID(Int32 id)
{
- if (id <= 0) return null;
+ if (id < 0) return null;
// 实体缓存
if (Meta.Session.Count < 1000) return Meta.Cache.Find(e => e.ID == id);
@@ -282,7 +282,7 @@ public override Object? this[String name]
/// 实体列表
public static IList FindAllByParentID(Int32 parentId)
{
- if (parentId <= 0) return [];
+ if (parentId < 0) return [];
// 实体缓存
if (Meta.Session.Count < 1000) return Meta.Cache.FindAll(e => e.ParentID == parentId);
diff --git "a/XUnitTest.XCode/Code/Entity/\345\255\227\345\205\270\345\217\202\346\225\260.cs" "b/XUnitTest.XCode/Code/Entity/\345\255\227\345\205\270\345\217\202\346\225\260.cs"
index bd3a33f4f..598a4d0ac 100644
--- "a/XUnitTest.XCode/Code/Entity/\345\255\227\345\205\270\345\217\202\346\225\260.cs"
+++ "b/XUnitTest.XCode/Code/Entity/\345\255\227\345\205\270\345\217\202\346\225\260.cs"
@@ -338,7 +338,7 @@ public override Object? this[String name]
/// 实体对象
public static Parameter? FindByID(Int32 id)
{
- if (id <= 0) return null;
+ if (id < 0) return null;
// 实体缓存
if (Meta.Session.Count < 1000) return Meta.Cache.Find(e => e.ID == id);
@@ -356,7 +356,7 @@ public override Object? this[String name]
/// 实体对象
public static Parameter? FindByUserIDAndCategoryAndName(Int32 userId, String? category, String? name)
{
- if (userId <= 0) return null;
+ if (userId < 0) return null;
if (category == null) return null;
if (name == null) return null;
@@ -371,7 +371,7 @@ public override Object? this[String name]
/// 实体列表
public static IList FindAllByUserID(Int32 userId)
{
- if (userId <= 0) return [];
+ if (userId < 0) return [];
// 实体缓存
if (Meta.Session.Count < 1000) return Meta.Cache.FindAll(e => e.UserID == userId);
@@ -385,7 +385,7 @@ public static IList FindAllByUserID(Int32 userId)
/// 实体列表
public static IList FindAllByUserIDAndCategory(Int32 userId, String? category)
{
- if (userId <= 0) return [];
+ if (userId < 0) return [];
if (category == null) return [];
// 实体缓存
diff --git "a/XUnitTest.XCode/Code/Entity/\346\210\220\345\221\230\346\227\245\345\277\227.cs" "b/XUnitTest.XCode/Code/Entity/\346\210\220\345\221\230\346\227\245\345\277\227.cs"
index 56477b2cd..4be3bd788 100644
--- "a/XUnitTest.XCode/Code/Entity/\346\210\220\345\221\230\346\227\245\345\277\227.cs"
+++ "b/XUnitTest.XCode/Code/Entity/\346\210\220\345\221\230\346\227\245\345\277\227.cs"
@@ -289,7 +289,7 @@ public override Object? this[String name]
/// 实体对象
public static MemberLog? FindByID(Int64 id)
{
- if (id <= 0) return null;
+ if (id < 0) return null;
return Find(_.ID == id);
}
@@ -313,7 +313,7 @@ public static IList FindAllByActionAndCategory(String? action, String
public static IList FindAllByCategoryAndLinkID(String? category, Int32 linkId)
{
if (category == null) return [];
- if (linkId <= 0) return [];
+ if (linkId < 0) return [];
return FindAll(_.Category == category & _.LinkID == linkId);
}
@@ -323,7 +323,7 @@ public static IList FindAllByCategoryAndLinkID(String? category, Int3
/// 实体列表
public static IList FindAllByCreateUserID(Int32 createUserId)
{
- if (createUserId <= 0) return [];
+ if (createUserId < 0) return [];
return FindAll(_.CreateUserID == createUserId);
}
diff --git "a/XUnitTest.XCode/Code/Entity/\346\227\245\345\277\227.cs" "b/XUnitTest.XCode/Code/Entity/\346\227\245\345\277\227.cs"
index 0b3e09dcd..31c231ea2 100644
--- "a/XUnitTest.XCode/Code/Entity/\346\227\245\345\277\227.cs"
+++ "b/XUnitTest.XCode/Code/Entity/\346\227\245\345\277\227.cs"
@@ -280,7 +280,7 @@ public override Object? this[String name]
/// 实体对象
public static Log? FindByID(Int64 id)
{
- if (id <= 0) return null;
+ if (id < 0) return null;
return Find(_.ID == id);
}
@@ -304,7 +304,7 @@ public static IList FindAllByActionAndCategory(String? action, String? cate
public static IList FindAllByCategoryAndLinkID(String? category, Int32 linkId)
{
if (category == null) return [];
- if (linkId <= 0) return [];
+ if (linkId < 0) return [];
return FindAll(_.Category == category & _.LinkID == linkId);
}
@@ -314,7 +314,7 @@ public static IList FindAllByCategoryAndLinkID(String? category, Int32 link
/// 实体列表
public static IList FindAllByCreateUserID(Int32 createUserId)
{
- if (createUserId <= 0) return [];
+ if (createUserId < 0) return [];
return FindAll(_.CreateUserID == createUserId);
}
diff --git "a/XUnitTest.XCode/Code/Entity/\347\224\250\346\210\267.cs" "b/XUnitTest.XCode/Code/Entity/\347\224\250\346\210\267.cs"
index 7548f2d6b..9a105ce6d 100644
--- "a/XUnitTest.XCode/Code/Entity/\347\224\250\346\210\267.cs"
+++ "b/XUnitTest.XCode/Code/Entity/\347\224\250\346\210\267.cs"
@@ -475,7 +475,7 @@ public override Object? this[String name]
/// 实体对象
public static User? FindByID(Int32 id)
{
- if (id <= 0) return null;
+ if (id < 0) return null;
// 实体缓存
if (Meta.Session.Count < 1000) return Meta.Cache.Find(e => e.ID == id);
@@ -546,7 +546,7 @@ public static IList FindAllByCode(String? code)
/// 实体列表
public static IList FindAllByRoleID(Int32 roleId)
{
- if (roleId <= 0) return [];
+ if (roleId < 0) return [];
// 实体缓存
if (Meta.Session.Count < 1000) return Meta.Cache.FindAll(e => e.RoleID == roleId);
diff --git "a/XUnitTest.XCode/Code/Entity/\347\224\250\346\210\267\346\227\245\345\277\227.cs" "b/XUnitTest.XCode/Code/Entity/\347\224\250\346\210\267\346\227\245\345\277\227.cs"
index 68acc2df0..8f7f32a06 100644
--- "a/XUnitTest.XCode/Code/Entity/\347\224\250\346\210\267\346\227\245\345\277\227.cs"
+++ "b/XUnitTest.XCode/Code/Entity/\347\224\250\346\210\267\346\227\245\345\277\227.cs"
@@ -291,7 +291,7 @@ public override Object? this[String name]
/// 实体对象
public static UserLog? FindByID(Int64 id)
{
- if (id <= 0) return null;
+ if (id < 0) return null;
return Find(_.ID == id);
}
@@ -315,7 +315,7 @@ public static IList FindAllByActionAndCategory(String? action, String?
public static IList FindAllByCategoryAndLinkID(String? category, Int32 linkId)
{
if (category == null) return [];
- if (linkId <= 0) return [];
+ if (linkId < 0) return [];
return FindAll(_.Category == category & _.LinkID == linkId);
}
@@ -325,7 +325,7 @@ public static IList FindAllByCategoryAndLinkID(String? category, Int32
/// 实体列表
public static IList FindAllByCreateUserID(Int32 createUserId)
{
- if (createUserId <= 0) return [];
+ if (createUserId < 0) return [];
return FindAll(_.CreateUserID == createUserId);
}
diff --git "a/XUnitTest.XCode/Code/Entity/\347\247\237\346\210\267.cs" "b/XUnitTest.XCode/Code/Entity/\347\247\237\346\210\267.cs"
index aace8e214..76e5f87f2 100644
--- "a/XUnitTest.XCode/Code/Entity/\347\247\237\346\210\267.cs"
+++ "b/XUnitTest.XCode/Code/Entity/\347\247\237\346\210\267.cs"
@@ -256,7 +256,7 @@ public override Object? this[String name]
/// 实体对象
public static Tenant? FindById(Int32 id)
{
- if (id <= 0) return null;
+ if (id < 0) return null;
// 实体缓存
if (Meta.Session.Count < 1000) return Meta.Cache.Find(e => e.Id == id);
diff --git "a/XUnitTest.XCode/Code/Entity/\347\247\237\346\210\267\345\205\263\347\263\273.cs" "b/XUnitTest.XCode/Code/Entity/\347\247\237\346\210\267\345\205\263\347\263\273.cs"
index eb7996413..1da2fa42e 100644
--- "a/XUnitTest.XCode/Code/Entity/\347\247\237\346\210\267\345\205\263\347\263\273.cs"
+++ "b/XUnitTest.XCode/Code/Entity/\347\247\237\346\210\267\345\205\263\347\263\273.cs"
@@ -229,7 +229,7 @@ public override Object? this[String name]
/// 实体对象
public static TenantUser? FindById(Int32 id)
{
- if (id <= 0) return null;
+ if (id < 0) return null;
// 实体缓存
if (Meta.Session.Count < 1000) return Meta.Cache.Find(e => e.Id == id);
@@ -246,8 +246,8 @@ public override Object? this[String name]
/// 实体对象
public static TenantUser? FindByTenantIdAndUserId(Int32 tenantId, Int32 userId)
{
- if (tenantId <= 0) return null;
- if (userId <= 0) return null;
+ if (tenantId < 0) return null;
+ if (userId < 0) return null;
// 实体缓存
if (Meta.Session.Count < 1000) return Meta.Cache.Find(e => e.TenantId == tenantId && e.UserId == userId);
@@ -260,7 +260,7 @@ public override Object? this[String name]
/// 实体列表
public static IList FindAllByTenantId(Int32 tenantId)
{
- if (tenantId <= 0) return [];
+ if (tenantId < 0) return [];
// 实体缓存
if (Meta.Session.Count < 1000) return Meta.Cache.FindAll(e => e.TenantId == tenantId);
@@ -273,7 +273,7 @@ public static IList FindAllByTenantId(Int32 tenantId)
/// 实体列表
public static IList FindAllByUserId(Int32 userId)
{
- if (userId <= 0) return [];
+ if (userId < 0) return [];
// 实体缓存
if (Meta.Session.Count < 1000) return Meta.Cache.FindAll(e => e.UserId == userId);
diff --git "a/XUnitTest.XCode/Code/Entity/\350\217\234\345\215\225.cs" "b/XUnitTest.XCode/Code/Entity/\350\217\234\345\215\225.cs"
index 85a9075ad..e6d88712e 100644
--- "a/XUnitTest.XCode/Code/Entity/\350\217\234\345\215\225.cs"
+++ "b/XUnitTest.XCode/Code/Entity/\350\217\234\345\215\225.cs"
@@ -373,7 +373,7 @@ public override Object? this[String name]
/// 实体对象
public static Menu? FindByID(Int32 id)
{
- if (id <= 0) return null;
+ if (id < 0) return null;
// 实体缓存
if (Meta.Session.Count < 1000) return Meta.Cache.Find(e => e.ID == id);
@@ -403,7 +403,7 @@ public static IList