owl-cli 6.33.0 → 6.35.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -509,6 +509,7 @@ function merge(oldObj,newObj,permissions,orgId){
|
|
|
509
509
|
}
|
|
510
510
|
}
|
|
511
511
|
}
|
|
512
|
+
return newObj;
|
|
512
513
|
|
|
513
514
|
}
|
|
514
515
|
|
|
@@ -518,11 +519,12 @@ function getListPermissionFilter(tableId, roleId,orgId,userId, permissions){
|
|
|
518
519
|
var filters = [];
|
|
519
520
|
var excludeFilters = [];
|
|
520
521
|
|
|
521
|
-
|
|
522
|
+
|
|
523
|
+
if(tp.same_org.list==='allowed' && tp.sub_org.list==='denied' && orgId!='0') {
|
|
522
524
|
//只能读取本组织的数据
|
|
523
525
|
filters.push({"term": {"_orgId.keyword": orgId}});
|
|
524
526
|
}
|
|
525
|
-
else if(tp.same_org.
|
|
527
|
+
else if(tp.same_org.list==='allowed' && tp.sub_org.list==='allowed' && orgId!='0'){
|
|
526
528
|
filters.push({"term": {"_orgIds.keyword": orgId}});
|
|
527
529
|
}
|
|
528
530
|
|