src/Hotline.Repository.SqlSugar/DataPermissions/DataPermissionFilterBuilder.cs

@@ -42,7 +42,6 @@ public class DataPermissionFilterBuilder : IDataPermissionFilterBuilder, IScopeD
     public Expression<Func<TEntity, bool>> BuildIncludeFlowData<TEntity>() where TEntity : class, IEntity<string>, IDataPermission, IWorkflow, new()
     {
         var userId = _sessionContext.RequiredUserId;
-        var roles = _sessionContext.Roles;
         var orgCode = _sessionContext.RequiredOrgCode;
         var queryFilterType = DataPermissionManager.GetQueryFilter<TEntity>(_sessionContext);
 
@@ -56,9 +55,7 @@ public class DataPermissionFilterBuilder : IDataPermissionFilterBuilder, IScopeD
                 return d => d.CreatorOrgCode == orgCode
                             || d.AssignUserIds.Contains(userId)
                             || d.AssignOrgCodes.Contains(orgCode)
-
-                            //todo 扩展sqlfunc || d.AssignRoles.Intersect(roles).Any()
-                            ;
+                    ;
             case EAuthorityType.OrgAndBelow:
                 return d => d.CreatorOrgCode.StartsWith(orgCode)
                             || d.AssignUserIds.Contains(userId)

src/Hotline.Share/Dtos/Order/OrderComplainDto.cs

@@ -56,19 +56,25 @@ public class OrderExtensionDto
     public string? LicenceNo { get; set; }
 
     /// <summary>
-    /// 提供方类型（投诉人类型）
+    /// 提供方身份类型
     /// </summary>
-    public EProviderType? ProviderType { get; set; }
+    public string? IdentityTypeCode { get; set; }
+
+    public string? IdentityType { get; set; }
 
     /// <summary>
     /// 提供方身份（投诉人身份）
     /// </summary>
-    public ECitizenStatus1? ProviderStatus { get; set; }
+    public string? IdentityCode { get; set; }
+
+    public string? Identity { get; set; }
 
     /// <summary>
     /// 国籍或地区
     /// </summary>
-    public ENationality? Nationality { get; set; }
+    public string? NationalityCode { get; set; }
+
+    public string? Nationality { get; set; }
 
     /// <summary>
     /// 民族
@@ -162,7 +168,8 @@ public class OrderExtensionDto
     /// <summary>
     /// 销售方式
     /// </summary>
-    public ESalesMode SalesMode { get; set; }
+    public string SalesModeCode { get; set; }
+    public string SalesMode { get; set; }
 
     /// <summary>
     /// 电商平台，销售方式为“网购”时展示该字段且必填

src/Hotline/Settings/RoleTablePermission.cs

@@ -0,0 +1,63 @@
+using System.ComponentModel;
+using SqlSugar;
+using XF.Domain.Repository;
+
+namespace Hotline.Settings;
+
+[Description("角色数据权限")]
+public class RoleTablePermission //: CreationEntity
+{
+    /// <summary>
+    /// 角色ID
+    /// </summary>
+    public string RoleId { get; set; }
+
+    /// <summary>
+    /// 角色Code
+    /// </summary>
+    public string RoleCode { get; set; }
+
+    [SugarColumn(ColumnDataType = "longtext", IsJson = true)]
+    public List<TablePermission> TablePermissions { get; set; }
+}
+
+
+public class TablePermission
+{
+    /// <summary>
+    /// 表权限等级
+    /// </summary>
+    public ETablePermissionLevel TablePermissionLevel { get; set; }
+
+    /// <summary>
+    /// 实体名
+    /// </summary>
+    public string EntityName { get; set; }
+}
+
+public enum ETablePermissionLevel
+{
+    /// <summary>
+    /// 全部可见
+    /// </summary>
+    [Description("全部可见")]
+    All = 0,
+
+    /// <summary>
+    /// 本部
+    /// </summary>
+    [Description("本部门可见")]
+    Org = 1,
+
+    /// <summary>
+    /// 本部及以下
+    /// </summary>
+    [Description("本部及下级部门可见")]
+    OrgAndBelow = 2,
+
+    /// <summary>
+    /// 创建人
+    /// </summary>
+    [Description("创建人可见")]
+    Creator = 3,
+}

src/Hotline/Settings/SystemDataAuthority.cs

@@ -9,7 +9,7 @@ using XF.Domain.Repository;
 namespace Hotline.Settings
 {
     [Description("数据权限分配")]
-    public class SystemDataAuthority: CreationEntity
+    public class SystemDataAuthority : CreationEntity
     {
         /// <summary>
         /// 角色ID