owl-cli 6.39.0 → 6.41.0

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

@@ -115,7 +115,7 @@ function expandTablePermission(permissions) {
             same_org.list = p.permission_same_org.add;
         }
         if(same_org.listall!='denied' && p.permission_same_org && p.permission_same_org.listall){
-            same_org.listall = p.permission_same_org.add;
+            same_org.listall = p.permission_same_org.listall;
         }
 
         if(sub_org.read!='denied' && p.permission_sub_org && p.permission_sub_org.read){
@@ -644,14 +644,13 @@ function getObjectPermissionFilter(tableId, roleId,orgId,userId){
     return [filters,excludeFilters]
 }
 function getListPermissionFilter(tableId, roleId,orgId,userId, permissions){
-    if(userId==='0'){
+    if(userId==='0' && orgId==='0' && roleId==='0'){
         return null;
     }
+
     //获得有权限的对象的filter
     var tp = expandTablePermission(permissions);
-    // $.log("tp=" + JSON.stringify(tp));
-    var filters = [];
-    var excludeFilters = [];
+
 
     //如果有listAll
 

package/defaultTemplate/api/src/handlers/list.jsx

@@ -140,7 +140,10 @@ function buildSort(sort){
   var filters = getFilters();
 
   var permissionFilter = getListPermissionFilter(tableId,roleId,orgId,loginId,permissions);
-  filters.push(permissionFilter);
+  if(permissionFilter){
+    filters.push(permissionFilter);
+  }
+
   if(recycleBin){
     filters.push({"term":{"del.keyword":"T"}});
     var query = {

package/package.json

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