owl-cli 6.40.0 → 6.41.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.
|
@@ -644,14 +644,13 @@ function getObjectPermissionFilter(tableId, roleId,orgId,userId){
|
|
|
644
644
|
return [filters,excludeFilters]
|
|
645
645
|
}
|
|
646
646
|
function getListPermissionFilter(tableId, roleId,orgId,userId, permissions){
|
|
647
|
-
if(userId==='0'){
|
|
647
|
+
if(userId==='0' && orgId==='0' && roleId==='0'){
|
|
648
648
|
return null;
|
|
649
649
|
}
|
|
650
|
+
|
|
650
651
|
//获得有权限的对象的filter
|
|
651
652
|
var tp = expandTablePermission(permissions);
|
|
652
|
-
|
|
653
|
-
var filters = [];
|
|
654
|
-
var excludeFilters = [];
|
|
653
|
+
|
|
655
654
|
|
|
656
655
|
//如果有listAll
|
|
657
656
|
|
|
@@ -140,7 +140,10 @@ function buildSort(sort){
|
|
|
140
140
|
var filters = getFilters();
|
|
141
141
|
|
|
142
142
|
var permissionFilter = getListPermissionFilter(tableId,roleId,orgId,loginId,permissions);
|
|
143
|
-
|
|
143
|
+
if(permissionFilter){
|
|
144
|
+
filters.push(permissionFilter);
|
|
145
|
+
}
|
|
146
|
+
|
|
144
147
|
if(recycleBin){
|
|
145
148
|
filters.push({"term":{"del.keyword":"T"}});
|
|
146
149
|
var query = {
|