角色实体新增角色类型

src/platform/ZhonTai.Admin/Domain/Role/RoleEntity.cs

@@ -40,6 +40,12 @@ public partial class RoleEntity : EntityTenant
     [Column(StringLength = 50)]
     public string Code { get; set; }
 
+    /// <summary>
+    /// 角色类型
+    /// </summary>
+    [Column(MapType = typeof(int), CanUpdate = false)]
+    public RoleType Type { get; set; }
+
     /// <summary>
     /// 数据范围
     /// </summary>

src/platform/ZhonTai.Admin/Domain/Role/RoleType.cs

@@ -0,0 +1,17 @@
+namespace ZhonTai.Admin.Domain.Role;
+
+/// <summary>
+/// 角色类型
+/// </summary>
+public enum RoleType
+{
+    /// <summary>
+    /// 分组
+    /// </summary>
+    Group = 1,
+
+    /// <summary>
+    /// 角色
+    /// </summary>
+    Menu = 2
+}

src/platform/ZhonTai.Admin/Services/Permission/PermissionService.cs

@@ -13,14 +13,12 @@ using ZhonTai.Admin.Domain.TenantPermission;
 using ZhonTai.Admin.Domain.UserRole;
 using ZhonTai.Admin.Domain.PermissionApi;
 using ZhonTai.Admin.Domain.Role;
-using ZhonTai.Admin.Domain.Api;
 using ZhonTai.Admin.Domain.User;
 using ZhonTai.DynamicApi;
 using ZhonTai.DynamicApi.Attributes;
 using ZhonTai.Admin.Core.Consts;
 using FreeSql;
 using ZhonTai.Admin.Domain.Tenant;
-using ZhonTai.Admin.Services.Role.Dto;
 
 namespace ZhonTai.Admin.Services.Permission;
 

src/platform/ZhonTai.Admin/Services/Role/Dto/RoleAddInput.cs

@@ -25,6 +25,11 @@ public class RoleAddInput
     /// </summary>
     public string Code { get; set; }
 
+    /// <summary>
+    /// 角色类型
+    /// </summary>
+    public RoleType Type { get; set; }
+
     /// <summary>
     /// 数据范围
     /// </summary>

src/platform/ZhonTai.Admin/Services/Role/Dto/RoleGetListOutput.cs

@@ -1,4 +1,6 @@
-namespace ZhonTai.Admin.Services.Role.Dto;
+using ZhonTai.Admin.Domain.Role;
+
+namespace ZhonTai.Admin.Services.Role.Dto;
 
 public class RoleGetListOutput
 {
@@ -22,6 +24,11 @@ public class RoleGetListOutput
     /// </summary>
     public string Code { get; set; }
 
+    /// <summary>
+    /// 角色类型
+    /// </summary>
+    public RoleType Type { get; set; }
+
     /// <summary>
     /// 排序
     /// </summary>

src/platform/ZhonTai.Admin/Services/Role/RoleService.cs

@@ -180,12 +180,12 @@ public class RoleService : BaseService, IRoleService, IDynamicApi
     {
         if (await _roleRepository.Select.AnyAsync(a => a.ParentId == input.ParentId && a.Name == input.Name))
         {
-            throw ResultOutput.Exception($"此{(input.ParentId == 0 ? "分组" : "角色")}已存在");
+            throw ResultOutput.Exception($"此{(input.Type == RoleType.Group ? "分组" : "角色")}已存在");
         }
 
         if (input.Code.NotNull() && await _roleRepository.Select.AnyAsync(a => a.ParentId == input.ParentId && a.Code == input.Code))
         {
-            throw ResultOutput.Exception($"此{(input.ParentId == 0 ? "分组" : "角色")}编码已存在");
+            throw ResultOutput.Exception($"此{(input.Type == RoleType.Group ? "分组" : "角色")}编码已存在");
         }
 
         var entity = Mapper.Map<RoleEntity>(input);
@@ -219,12 +219,12 @@ public class RoleService : BaseService, IRoleService, IDynamicApi
 
         if (await _roleRepository.Select.AnyAsync(a => a.ParentId == input.ParentId && a.Id != input.Id && a.Name == input.Name))
         {
-            throw ResultOutput.Exception($"此{(input.ParentId == 0 ? "分组" : "角色")}已存在");
+            throw ResultOutput.Exception($"此{(input.Type == RoleType.Group ? "分组" : "角色")}已存在");
         }
 
         if (input.Code.NotNull() && await _roleRepository.Select.AnyAsync(a => a.ParentId == input.ParentId && a.Id != input.Id && a.Code == input.Code))
         {
-            throw ResultOutput.Exception($"此{(input.ParentId == 0 ? "分组" : "角色")}编码已存在");
+            throw ResultOutput.Exception($"此{(input.Type == RoleType.Group ? "分组" : "角色")}编码已存在");
         }
 
         Mapper.Map(input, entity);

src/platform/ZhonTai.Admin/ZhonTai.Admin.xml

@@ -2482,6 +2482,11 @@
             编码
             </summary>
         </member>
+        <member name="P:ZhonTai.Admin.Domain.Role.RoleEntity.Type">
+            <summary>
+            角色类型
+            </summary>
+        </member>
         <member name="P:ZhonTai.Admin.Domain.Role.RoleEntity.DataScope">
             <summary>
             数据范围
@@ -2517,6 +2522,21 @@
             权限列表
             </summary>
         </member>
+        <member name="T:ZhonTai.Admin.Domain.Role.RoleType">
+            <summary>
+            角色类型
+            </summary>
+        </member>
+        <member name="F:ZhonTai.Admin.Domain.Role.RoleType.Group">
+            <summary>
+            分组
+            </summary>
+        </member>
+        <member name="F:ZhonTai.Admin.Domain.Role.RoleType.Menu">
+            <summary>
+            角色
+            </summary>
+        </member>
         <member name="T:ZhonTai.Admin.Domain.TenantPermission.TenantPermissionEntity">
             <summary>
             租户权限
@@ -5021,6 +5041,11 @@
             编码
             </summary>
         </member>
+        <member name="P:ZhonTai.Admin.Services.Role.Dto.RoleAddInput.Type">
+            <summary>
+            角色类型
+            </summary>
+        </member>
         <member name="P:ZhonTai.Admin.Services.Role.Dto.RoleAddInput.DataScope">
             <summary>
             数据范围
@@ -5081,6 +5106,11 @@
             编码
             </summary>
         </member>
+        <member name="P:ZhonTai.Admin.Services.Role.Dto.RoleGetListOutput.Type">
+            <summary>
+            角色类型
+            </summary>
+        </member>
         <member name="P:ZhonTai.Admin.Services.Role.Dto.RoleGetListOutput.Sort">
             <summary>
             排序