|
@@ -46,7 +46,7 @@ public class DataPermissionFilterBuilder : IDataPermissionFilterBuilder, IScopeD
|
|
if (roles != null && roles.Contains(RoleSeedData.AdminRole))
|
|
if (roles != null && roles.Contains(RoleSeedData.AdminRole))
|
|
return d => true;
|
|
return d => true;
|
|
|
|
|
|
- return d => SqlFunc.JsonArrayAny(d.FlowedUserIds, _sessionContext.RequiredOrgId) ||
|
|
|
|
|
|
+ return d => SqlFunc.JsonArrayAny(d.FlowedUserIds, _sessionContext.RequiredUserId) ||
|
|
SqlFunc.JsonArrayAny(d.FlowedOrgIds, _sessionContext.RequiredOrgId);
|
|
SqlFunc.JsonArrayAny(d.FlowedOrgIds, _sessionContext.RequiredOrgId);
|
|
}
|
|
}
|
|
|
|
|
|
@@ -57,9 +57,9 @@ public class DataPermissionFilterBuilder : IDataPermissionFilterBuilder, IScopeD
|
|
return d => true;
|
|
return d => true;
|
|
|
|
|
|
return d =>
|
|
return d =>
|
|
- (SqlFunc.JsonArrayAny(d.FlowedUserIds, _sessionContext.RequiredOrgId) ||
|
|
|
|
|
|
+ (SqlFunc.JsonArrayAny(d.FlowedUserIds, _sessionContext.RequiredUserId) ||
|
|
SqlFunc.JsonArrayAny(d.FlowedOrgIds, _sessionContext.RequiredOrgId)) &&
|
|
SqlFunc.JsonArrayAny(d.FlowedOrgIds, _sessionContext.RequiredOrgId)) &&
|
|
- (SqlFunc.JsonListObjectAny(d.HandlerUsers, "Key", _sessionContext.RequiredOrgId) ||
|
|
|
|
|
|
+ (SqlFunc.JsonListObjectAny(d.HandlerUsers, "Key", _sessionContext.RequiredUserId) ||
|
|
SqlFunc.JsonListObjectAny(d.HandlerOrgs, "Key", _sessionContext.RequiredOrgId));
|
|
SqlFunc.JsonListObjectAny(d.HandlerOrgs, "Key", _sessionContext.RequiredOrgId));
|
|
}
|
|
}
|
|
|
|
|