owl-cli 6.99.0 → 6.101.0

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

@@ -675,7 +675,7 @@ function getObjectPermissionFilter(tableId, roleId,orgId,userId){
     return [filters,excludeFilters]
 }
 function getListPermissionFilter(tableId, roleId,orgId,userId, permissions){
-    if(userId==='0' && orgId==='0' && roleId==='0'){
+    if(userId==='0' && orgId==='0'){
         return null;
     }
 
@@ -687,10 +687,8 @@ function getListPermissionFilter(tableId, roleId,orgId,userId, permissions){
 
     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}
-        };
+        // var objFilters = getObjectPermissionFilter(tableId, roleId,orgId,userId, permissions);
+        var orgFilter = null;
         if(tp.sub_org.listall==='allowed'){
             if(orgId!='0'){
                 orgFilter = {
@@ -701,33 +699,30 @@ 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": {}};
+            }
+
         }
-        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/defaultTemplate/api/src/services/modelService.jsx

@@ -510,9 +510,10 @@ var @projectCodeService = (function (pigeon) {
                 if(meta.isTree){
                     f.updateParentPath(data);
                 }
-                pigeon.lock(f.getLock(data))
+
                 EventBusService.fire(spec['_t'] + '_add_before', {data: data, env: env})
                 data.id = f.getId(data)
+                pigeon.lock(f.getLock(data))
                 f.saveUniqueFields(data, env)
                 pigeon.saveObject(data.id, data)
                 f.addToList(data)

package/package.json

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