owl-cli 6.101.0 → 6.103.0

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

@@ -675,17 +675,18 @@ function getObjectPermissionFilter(tableId, roleId,orgId,userId){
     return [filters,excludeFilters]
 }
 function getListPermissionFilter(tableId, roleId,orgId,userId, permissions){
-    if(userId==='0' && orgId==='0'){
+    if(userId==='0' && orgId==='0' && roleId==='0'){
         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 = null;
@@ -710,6 +711,16 @@ function getListPermissionFilter(tableId, roleId,orgId,userId, permissions){
             }
 
         }
+        else {
+            if(orgId!='0'){
+                orgFilter = {
+                    "term": {"_orgIds.keyword": orgId}
+                }
+            }
+            else{
+                orgFilter = { "match_all": {}};
+            }
+        }
         var shouldFilters = [];
         if(orgFilter){
             shouldFilters.push(orgFilter);

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

@@ -98,13 +98,28 @@
   } catch ( e ) {
     var ret = {
       state: 'err',
-      msg: (e.msg || e) + ""
+      msg: getErrorMsg(e)
     };
     out.print( JSON.stringify( ret ) );
   }
 })();
 
+function getErrorMsg(e){
+  if(typeof e === 'string'){
+    return e;
+  }
+  var msg = e.msg || e.message || e.toString();
+  var beginIdx = msg.indexOf(':');
+  if(beginIdx===-1){
+    return msg;
+  }
+  var endIdx = msg.indexOf('(',beginIdx);
+  if(endIdx===-1){
+    return msg;
+  }
+  return msg.substring(beginIdx+1,endIdx);
 
+}
 
 
 

package/package.json

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