Browse Source

Merge branch 'master' of http://git.12345lm.cn/Fengwo/hotline

Dun.Jason 1 year ago
parent
commit
49bb13dbc1

+ 3 - 2
src/Hotline.Repository.SqlSugar/DataPermissions/DataPermissionFilterBuilder.cs

@@ -69,8 +69,9 @@ public class DataPermissionFilterBuilder : IDataPermissionFilterBuilder, IScopeD
         else
         {
             return d =>
-                !(SqlFunc.JsonListObjectAny(d.HandlerUsers, "Key", userId) ||
-                  SqlFunc.JsonListObjectAny(d.HandlerOrgs, "Key", orgId));
+                (SqlFunc.JsonArrayAny(d.FlowedUserIds, userId) || SqlFunc.JsonArrayAny(d.FlowedOrgIds, orgId)) &&
+                 !(SqlFunc.JsonListObjectAny(d.HandlerUsers, "Key", userId) ||
+                   SqlFunc.JsonListObjectAny(d.HandlerOrgs, "Key", orgId));
         }
     }