修改User模块

Modules/Store.Users/Entities/UserEntity.cs

@@ -1,4 +1,5 @@
-using FreeSql.DataAnnotations;
+using Store.Users.Contracts.Enums;
+using FreeSql.DataAnnotations;
 using System;
 
 namespace Store.Users.Entities
@@ -40,10 +41,10 @@ namespace Store.Users.Entities
 		public string CardId { get; set; }
 
 		/// <summary>
-		/// 用户分组 3主号 4客服 5加盟 8登录 9采购 10加盟 11上货
+		/// 用户分组，参见 <see cref="UserGroup"/>。
 		/// </summary>
-		[Column(Name = "group_id")]
-		public byte GroupId { get; set; }
+		[Column(Name = "group_id", MapType = typeof(byte))]
+		public UserGroup GroupId { get; set; }
 
 		/// <summary>
 		/// 父账户用户名
@@ -88,10 +89,10 @@ namespace Store.Users.Entities
 		public string Notes { get; set; }
 
 		/// <summary>
-		/// 超管等级 0 普通用户 1 超级管理员
+		/// 超管等级，参见 <see cref="UserAdminLevel"/>。
 		/// </summary>
-		[Column(Name = "sa_level")]
-		public short? SaLevel { get; set; }
+		[Column(Name = "sa_level", MapType = typeof(short))]
+		public UserAdminLevel? SaLevel { get; set; }
 
 		/// <summary>
 		/// 账户权限
@@ -165,7 +166,8 @@ namespace Store.Users.Entities
 		/// </summary>
 		public bool IsMainUser
 		{
-			get => string.IsNullOrWhiteSpace(ParentUserName);
+			// 只有主号分组且无父账号才是主账号，不能把缺失父账号的子账号当作主账号。
+			get => GroupId == UserGroup.MainAccount && string.IsNullOrWhiteSpace(ParentUserName);
 		}
 		/// <summary>
 		/// 是否OEM租户