owl-cli 6.37.0 → 6.38.0

package/defaultTemplate/api/src/handlers/include/checklogin.jsx

@@ -76,13 +76,19 @@ function checklogin() {
 function getPermissions(roleId, tableId) {
     var searchArgs = {
         roleId: roleId,
-        tableId: tableId
-    }
-    var sr = owl_permissionService.search("0", searchArgs, null, 0, 10000, null);
-    if (sr.state === 'ok') {
+        tables:{
+            type:"or",
+            args:[
+                { tableId: tableId},
+                { tableId: "*"}
+            ]
+       }
+   }
+   var sr = owl_permissionService.search("0", searchArgs, null, 0, 10000, null);
+   if (sr.state === 'ok') {
         return sr.list;
-    }
-    return [];
+   }
+   return [];
 }
 
 function expandTablePermission(permissions) {
@@ -518,82 +524,186 @@ function merge(oldObj,newObj,permissions,orgId){
 
 }
 
-function getListPermissionFilter(tableId, roleId,orgId,userId, permissions){
-    //获得有权限的对象的filter
-    var tp = expandTablePermission(permissions);
-    // $.log("tp=" + JSON.stringify(tp));
+function getObjectPermissionFilter(tableId, roleId,orgId,userId){
     var filters = [];
     var excludeFilters = [];
 
-
-    if(tp.same_org.list==='allowed' && tp.sub_org.list==='denied' && orgId!='0') {
-        //只能读取本组织的数据
-        filters.push({"term": {"_orgId.keyword": orgId}});
-    }
-    else if(tp.same_org.list==='allowed' && tp.sub_org.list==='allowed' && orgId!='0'){
-        filters.push({"term": {"_orgIds.keyword": orgId}});
-    }
-
-    filters.concat([
+    filters = [
         {
-            "permissions.orgId.keyword":orgId,
-            "permissions.roleId.keyword":roleId,
-            "permissions.list.keyword":"allowed",
+            bool: {
+                filter:[
+                    {term:{"permissions.orgId.keyword":orgId}},
+                    {term:{"permissions.roleId.keyword":roleId}},
+                    {term:{"permissions.list.keyword":"allowed"}}
+                ]
+            }
         },
         {
-            "permissions.orgId.keyword":orgId,
-            "permissions.roleId.keyword":"*",
-            "permissions.list.keyword":"allowed",
+            bool: {
+                filter:[
+                    {term:{"permissions.orgId.keyword":orgId}},
+                    {term:{"permissions.roleId.keyword":"*"}},
+                    {term:{"permissions.list.keyword":"allowed"}}
+                ]
+            }
         },
         {
-            "permissions.orgId.keyword":"*",
-            "permissions.roleId.keyword":roleId,
-            "permissions.list.keyword":"allowed",
+            bool: {
+                filter:[
+                    {term:{"permissions.orgId.keyword":"*"}},
+                    {term:{"permissions.roleId.keyword":roleId}},
+                    {term:{"permissions.list.keyword":"allowed"}}
+                ]
+            }
         },
         {
-            "permissions.orgId.keyword":"*",
-            "permissions.roleId.keyword":"*",
-            "permissions.list.keyword":"allowed",
+            bool: {
+                filter:[
+                    {term:{"permissions.orgId.keyword":"*"}},
+                    {term:{"permissions.roleId.keyword":"*"}},
+                    {term:{"permissions.list.keyword":"allowed"}}
+                ]
+            }
         },
         {
-            "permissions.userId.keyword":userId,
-            "permissions.list.keyword":"allowed",
+            bool: {
+                filter:[
+                    {term:{"permissions.userId.keyword":userId}},
+                    {term:{"permissions.list.keyword":"allowed"}}
+                ]
+            }
         },
         {
-            "permissions.userId":"*",
-            "permissions.list.keyword":"allowed",
+            bool: {
+                filter:[
+                    {term:{"permissions.userId.keyword":"*"}},
+                    {term:{"permissions.list.keyword":"allowed"}}
+                ]
+            }
         }
-    ]);
+    ];
     //获取对象本身的权限
 
-    excludeFilters.concat([
+    excludeFilters= [
+        {
+            bool: {
+                filter:[
+                    {term:{"permissions.orgId.keyword":orgId}},
+                    {term:{"permissions.roleId.keyword":roleId}},
+                    {term:{"permissions.list.keyword":"denied"}}
+                ]
+            }
+        },
+        {
+            bool: {
+                filter:[
+                    {term:{"permissions.orgId.keyword":orgId}},
+                    {term:{"permissions.roleId.keyword":"*"}},
+                    {term:{"permissions.list.keyword":"denied"}}
+                ]
+            }
+        },
         {
-            "permissions.orgId.keyword":orgId,
-            "permissions.roleId.keyword":roleId,
-            "permissions.list.keyword":"denied",
+            bool: {
+                filter:[
+                    {term:{"permissions.orgId.keyword":"*"}},
+                    {term:{"permissions.roleId.keyword":roleId}},
+                    {term:{"permissions.list.keyword":"denied"}}
+                ]
+            }
         },
         {
-            "permissions.orgId.keyword":orgId,
-            "permissions.roleId.keyword":"*",
-            "permissions.list.keyword":"denied",
+            bool: {
+                filter:[
+                    {term:{"permissions.orgId.keyword":"*"}},
+                    {term:{"permissions.roleId.keyword":"*"}},
+                    {term:{"permissions.list.keyword":"denied"}}
+                ]
+            }
         },
         {
-            "permissions.orgId.keyword":"*",
-            "permissions.roleId.keyword":roleId,
-            "permissions.list.keyword":"denied",
+            bool: {
+                filter:[
+                    {term:{"permissions.userId.keyword":userId}},
+                    {term:{"permissions.list.keyword":"denied"}}
+                ]
+            }
         },
         {
-            "permissions.userId.keyword":userId,
-            "permissions.list.keyword":"denied",
+            bool: {
+                filter:[
+                    {term:{"permissions.userId.keyword":"*"}},
+                    {term:{"permissions.list.keyword":"denied"}}
+                ]
+            }
+        }
+    ];
+    return [filters,excludeFilters]
+}
+function getListPermissionFilter(tableId, roleId,orgId,userId, permissions){
+    if(userId==='0'){
+        return null;
+    }
+    //获得有权限的对象的filter
+    var tp = expandTablePermission(permissions);
+    // $.log("tp=" + JSON.stringify(tp));
+    var filters = [];
+    var excludeFilters = [];
+
+    //如果有listAll
+
+    if(tp.same_org.listall==='allowed' || tp.sub_org.listall==='allowed') {
+        //只能读取本组织的数据
+        var objFilters = getObjectPermissionFilter(tableId, roleId,orgId,userId, permissions);
+        var orgFilter = {
+            "term": {"_orgId.keyword": orgId}
+        };
+        if(tp.sub_org.listall==='allowed'){
+            if(orgId!='0'){
+                orgFilter = {
+                    "term": {"_orgIds.keyword": orgId}
+                }
+            }
+            else{
+                orgFilter = { "match_all": {}};
+            }
+        }
+        if(tp.same_org.listall!=='allowed'){
+            orgFilter = {
+                bool:{
+                    filter:[{
+                        "term": {"_orgIds.keyword": orgId}
+                    }],
+                    must_not:[{
+                        "term": {"_orgId.keyword": orgId}
+                    }],
+                }
+            }
+        }
+        var shouldFilters = objFilters[0];
+        if(orgFilter){
+            shouldFilters.push(orgFilter);
+        }
+        //组合对象允许的
+        return  {
+            bool:{
+                should:shouldFilters,
+                must_not:objFilters[1]
+            }
         }
-    ]);
+    }
+    else {
+        var objFilters = getObjectPermissionFilter(tableId, roleId,orgId,userId, permissions);
 
-    return {
-        bool:{
-            should:filters,
-            must_not:excludeFilters
+        return {
+            bool:{
+                should:objFilters[0],
+                must_not:objFilters[1]
+            }
         }
-    };
+    }
+
+
 }
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "owl-cli",
-  "version": "6.37.0",
+  "version": "6.38.0",
   "main": "index.js",
   "preferGlobal": true,
   "bin": {