xf 1 年之前
父节点
当前提交
14b17ed36a

+ 3 - 3
src/Hotline.Repository.SqlSugar/DataPermissions/DataPermissionManager.cs

@@ -37,7 +37,7 @@ public class DataPermissionManager : IDataPermissionManager, IScopeDependency
         //return queryFilter;
     }
 
-    public (string orgId, string orgCode, string creatorId, string? areaId) GetDataPermissionOptions()
+    public (string? orgId, string? orgCode, string? creatorId, string? areaId) GetDataPermissionOptions()
     {
         //using var scope = _serviceScopeFactory.CreateScope();
         //var userRepository = scope.ServiceProvider.GetRequiredService<IUserRepository>();
@@ -50,8 +50,8 @@ public class DataPermissionManager : IDataPermissionManager, IScopeDependency
         //    return (org!.Id, org.OrgCode, _sessionContext.RequiredUserId, org.OrgCode);
         //}
         //return ("", "", _sessionContext.RequiredUserId, "");
-        return (_sessionContext.RequiredOrgId, _sessionContext.RequiredOrgCode,
-            _sessionContext.RequiredUserId, _sessionContext.RequiredOrgId);
+        return (_sessionContext.OrgId, _sessionContext.OrgCode,
+            _sessionContext.UserId, _sessionContext.OrgId);
     }
 
     //private ETableAccessLevel GetCurrentQueryFilter(string[] roles, string entityName)

+ 1 - 1
src/Hotline.Repository.SqlSugar/DataPermissions/IDataPermissionManager.cs

@@ -7,5 +7,5 @@ namespace Hotline.Repository.SqlSugar.DataPermissions;
 public interface IDataPermissionManager
 {
     ETableAccessLevel GetQueryFilter<TEntity>(ISessionContext sessionContext) where TEntity : class, IEntity<string>, IDataPermission, new();
-    (string orgId, string orgCode, string creatorId, string? areaId) GetDataPermissionOptions();
+    (string? orgId, string? orgCode, string? creatorId, string? areaId) GetDataPermissionOptions();
 }

+ 1 - 0
src/Hotline.Share/Hotline.Share.csproj

@@ -7,6 +7,7 @@
     <GenerateDocumentationFile>True</GenerateDocumentationFile>
     <NoWarn>$(NoWarn);1591</NoWarn>
     <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
+    <Version>1.0.1</Version>
   </PropertyGroup>
 
   <ItemGroup>