|
@@ -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)
|