owl-cli 6.31.0 → 6.33.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.
|
@@ -518,11 +518,11 @@ function getListPermissionFilter(tableId, roleId,orgId,userId, permissions){
|
|
|
518
518
|
var filters = [];
|
|
519
519
|
var excludeFilters = [];
|
|
520
520
|
|
|
521
|
-
if(tp.same_org.read==='allowed' && tp.sub_org.read==='denied') {
|
|
521
|
+
if(tp.same_org.read==='allowed' && tp.sub_org.read==='denied' && orgId!='0') {
|
|
522
522
|
//只能读取本组织的数据
|
|
523
523
|
filters.push({"term": {"_orgId.keyword": orgId}});
|
|
524
524
|
}
|
|
525
|
-
else if(tp.same_org.read==='allowed' && tp.sub_org.read==='allowed'){
|
|
525
|
+
else if(tp.same_org.read==='allowed' && tp.sub_org.read==='allowed'&& orgId!='0'){
|
|
526
526
|
filters.push({"term": {"_orgIds.keyword": orgId}});
|
|
527
527
|
}
|
|
528
528
|
|
|
@@ -139,7 +139,7 @@ function buildSort(sort){
|
|
|
139
139
|
|
|
140
140
|
var filters = getFilters();
|
|
141
141
|
|
|
142
|
-
var permissionFilter = getListPermissionFilter(tableId,roleId,loginId,permissions);
|
|
142
|
+
var permissionFilter = getListPermissionFilter(tableId,roleId,orgId,loginId,permissions);
|
|
143
143
|
filters.push(permissionFilter);
|
|
144
144
|
if(recycleBin){
|
|
145
145
|
filters.push({"term":{"del.keyword":"T"}});
|