owl-cli 6.100.0 → 6.102.0

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

@@ -679,18 +679,17 @@ function getListPermissionFilter(tableId, roleId,orgId,userId, permissions){
         return null;
     }
 
+    $.log("getListPermissionFilter tableId="+tableId+",roleId="+roleId+",orgId="+orgId+",userId="+userId+", permissions="+JSON.stringify(permissions));
     //获得有权限的对象的filter
     var tp = expandTablePermission(permissions);
 
 
     //如果有listAll
 
-    if(tp.same_org.listall==='allowed' || tp.sub_org.listall==='allowed') {
+    if(tp.same_org.listall==='allowed' || tp.sub_org.listall==='allowed' || roleId=='0' || userId=='0') {
         //只能读取本组织的数据
-        var objFilters = getObjectPermissionFilter(tableId, roleId,orgId,userId, permissions);
-        var orgFilter = {
-            "term": {"_orgId.keyword": orgId}
-        };
+        // var objFilters = getObjectPermissionFilter(tableId, roleId,orgId,userId, permissions);
+        var orgFilter = null;
         if(tp.sub_org.listall==='allowed'){
             if(orgId!='0'){
                 orgFilter = {
@@ -701,33 +700,40 @@ function getListPermissionFilter(tableId, roleId,orgId,userId, permissions){
                 orgFilter = { "match_all": {}};
             }
         }
-        if(tp.same_org.listall!=='allowed'){
-            orgFilter = {
-                bool:{
-                    filter:[{
-                        "term": {"_orgIds.keyword": orgId}
-                    }],
-                    must_not:[{
-                        "term": {"_orgId.keyword": orgId}
-                    }],
+        else if(tp.same_org.listall==='allowed'){
+            if(orgId!='0'){
+                orgFilter =  {
+                    "term": {"_orgId.keyword": orgId}
+                }
+            }
+            else{
+                orgFilter = { "match_all": {}};
+            }
+
+        }
+        else {
+            if(orgId!='0'){
+                orgFilter = {
+                    "term": {"_orgIds.keyword": orgId}
                 }
             }
+            else{
+                orgFilter = { "match_all": {}};
+            }
         }
-        var shouldFilters = objFilters[0];
+        var shouldFilters = [];
         if(orgFilter){
             shouldFilters.push(orgFilter);
         }
         //组合对象允许的
         return  {
             bool:{
-                should:shouldFilters,
-                must_not:objFilters[1]
+                should:shouldFilters
             }
         }
     }
     else {
         var objFilters = getObjectPermissionFilter(tableId, roleId,orgId,userId, permissions);
-
         return {
             bool:{
                 should:objFilters[0],

package/package.json

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