owl-cli 6.131.0 → 6.132.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.
|
@@ -714,7 +714,7 @@ function getListPermissionFilter(tableId, roleId,orgId,userId, permissions){
|
|
|
714
714
|
return null;
|
|
715
715
|
}
|
|
716
716
|
|
|
717
|
-
$.log("getListPermissionFilter tableId="+tableId+",roleId="+roleId+",orgId="+orgId+",userId="+userId+", permissions="+JSON.stringify(permissions));
|
|
717
|
+
// $.log("getListPermissionFilter tableId="+tableId+",roleId="+roleId+",orgId="+orgId+",userId="+userId+", permissions="+JSON.stringify(permissions));
|
|
718
718
|
//获得有权限的对象的filter
|
|
719
719
|
var tp = expandTablePermission(permissions);
|
|
720
720
|
|
|
@@ -70,16 +70,16 @@ function buildSort(sort){
|
|
|
70
70
|
var meta = spec['#meta'];
|
|
71
71
|
var isPublic = meta && meta.isPublic;
|
|
72
72
|
|
|
73
|
+
var mfilters = null;
|
|
73
74
|
if(isPublic || orgId=='0'){
|
|
74
75
|
delete searchArgs["_orgIds"];
|
|
75
76
|
}
|
|
76
77
|
else{
|
|
77
78
|
searchArgs["_orgIds"] = orgId;
|
|
79
|
+
mfilters = getListPermissionFilter(tableId, roleId, orgId, loginId, permissions);
|
|
78
80
|
}
|
|
79
81
|
|
|
80
|
-
|
|
81
82
|
var dataSource = null;
|
|
82
|
-
var mfilters = getListPermissionFilter(tableId, roleId, orgId, loginId, permissions);
|
|
83
83
|
|
|
84
84
|
var isRecycleBin = false;
|
|
85
85
|
if(recycleBin){
|