owl-cli 6.36.0 → 6.37.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.
|
@@ -521,7 +521,7 @@ function merge(oldObj,newObj,permissions,orgId){
|
|
|
521
521
|
function getListPermissionFilter(tableId, roleId,orgId,userId, permissions){
|
|
522
522
|
//获得有权限的对象的filter
|
|
523
523
|
var tp = expandTablePermission(permissions);
|
|
524
|
-
$.log("tp=" + JSON.stringify(tp));
|
|
524
|
+
// $.log("tp=" + JSON.stringify(tp));
|
|
525
525
|
var filters = [];
|
|
526
526
|
var excludeFilters = [];
|
|
527
527
|
|
|
@@ -555,21 +555,6 @@ function getListPermissionFilter(tableId, roleId,orgId,userId, permissions){
|
|
|
555
555
|
"permissions.roleId.keyword":"*",
|
|
556
556
|
"permissions.list.keyword":"allowed",
|
|
557
557
|
},
|
|
558
|
-
{
|
|
559
|
-
"permissions.orgId.keyword":orgId,
|
|
560
|
-
"permissions.roleId.keyword":roleId,
|
|
561
|
-
"permissions.list.keyword":"allowed",
|
|
562
|
-
},
|
|
563
|
-
{
|
|
564
|
-
"permissions.orgId.keyword":orgId,
|
|
565
|
-
"permissions.roleId.keyword":"*",
|
|
566
|
-
"permissions.list.keyword":"allowed",
|
|
567
|
-
},
|
|
568
|
-
{
|
|
569
|
-
"permissions.orgId.keyword":"*",
|
|
570
|
-
"permissions.roleId.keyword":roleId,
|
|
571
|
-
"permissions.list.keyword":"allowed",
|
|
572
|
-
},
|
|
573
558
|
{
|
|
574
559
|
"permissions.userId.keyword":userId,
|
|
575
560
|
"permissions.list.keyword":"allowed",
|
|
@@ -597,16 +582,6 @@ function getListPermissionFilter(tableId, roleId,orgId,userId, permissions){
|
|
|
597
582
|
"permissions.roleId.keyword":roleId,
|
|
598
583
|
"permissions.list.keyword":"denied",
|
|
599
584
|
},
|
|
600
|
-
{
|
|
601
|
-
"permissions.orgId.keyword":orgId,
|
|
602
|
-
"permissions.roleId.keyword":roleId,
|
|
603
|
-
"permissions.list.keyword":"denied",
|
|
604
|
-
},
|
|
605
|
-
{
|
|
606
|
-
"permissions.orgId.keyword":"*",
|
|
607
|
-
"permissions.roleId.keyword":roleId,
|
|
608
|
-
"permissions.list.keyword":"denied",
|
|
609
|
-
},
|
|
610
585
|
{
|
|
611
586
|
"permissions.userId.keyword":userId,
|
|
612
587
|
"permissions.list.keyword":"denied",
|