|
@@ -8,7 +8,7 @@ namespace Hotline.Repository.SqlSugar
|
|
|
{
|
|
|
public static class QueryExtensions
|
|
|
{
|
|
|
- public static ISugarQueryable<TEntity> DataPermissionFiltering<TEntity>(this ISugarQueryable<TEntity> queryable, IDataPermissionFilterBuilder dataPermissionFilterBuilder)
|
|
|
+ public static ISugarQueryable<TEntity> DataPermissionFiltering<TEntity>(this ISugarQueryable<TEntity> queryable, IDataPermissionFilterBuilder dataPermissionFilterBuilder)
|
|
|
where TEntity : class, IEntity<string>, IDataPermission, new()
|
|
|
{
|
|
|
return queryable.Where(dataPermissionFilterBuilder.Build<TEntity>());
|
|
@@ -53,12 +53,7 @@ namespace Hotline.Repository.SqlSugar
|
|
|
DataPermissionScheme GetQueryFilter<TEntity>(string userId) where TEntity : class, IEntity<string>, IDataPermission, new();
|
|
|
}
|
|
|
|
|
|
- public class DataPermissionScheme
|
|
|
- {
|
|
|
- public EQueryFilter QueryFilter { get; set; }
|
|
|
- public string OrgCode { get; set; }
|
|
|
- public string AreaId { get; set; }
|
|
|
- }
|
|
|
+ public record DataPermissionScheme(EQueryFilter QueryFilter, string? OrgCode = "", string? AreaId = "");
|
|
|
|
|
|
public class DataPermissionManager : IDataPermissionManager
|
|
|
{
|
|
@@ -71,17 +66,13 @@ namespace Hotline.Repository.SqlSugar
|
|
|
}
|
|
|
|
|
|
if (queryFilter == EQueryFilter.CreatorOnly)
|
|
|
- return new DataPermissionScheme { QueryFilter = EQueryFilter.CreatorOnly };
|
|
|
+ return new DataPermissionScheme(EQueryFilter.CreatorOnly);
|
|
|
|
|
|
if (queryFilter == EQueryFilter.SelfAndSubDepartment)
|
|
|
{
|
|
|
//todo 查询对应部门编码
|
|
|
|
|
|
- return new DataPermissionScheme
|
|
|
- {
|
|
|
- QueryFilter = EQueryFilter.SelfAndSubDepartment,
|
|
|
- OrgCode = "",
|
|
|
- };
|
|
|
+ return new DataPermissionScheme(EQueryFilter.SelfAndSubDepartment, "");
|
|
|
}
|
|
|
|
|
|
throw new NotImplementedException();
|