owl-cli 6.196.0 → 6.198.0

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

@@ -303,34 +303,37 @@ function checkPermission(data, permissions, orgId, action) {
         throw "表没有列出权限。"
     }
     //检查section_permission
-    for (var k in data) {
-        if(valid_fields.indexOf(k)>-1){
-            continue;
-        }
-        var v = data[k];
-        //if v is section
-        if (typeof v === 'object') {
-            //ef_field_permissions
-            if (ef_section_permissions && ef_section_permissions[k] && ef_section_permissions[k][action] === 'denied') {
-                throw "section没有" + action + "权限,sectionKey=" + k
-            }
-            if(Array.isArray(v)){
-                for(var i=0; i<v.length; i++){
-                    var r = v[i];
-                    checkObject(r,ef_field_permissions,k,action);
-                }
+    if(data){
+        for (var k in data) {
+            if(valid_fields.indexOf(k)>-1){
+                continue;
             }
-            else{
-                checkObject(v,ef_field_permissions,k,action);
+            var v = data[k];
+            //if v is section
+            if (typeof v === 'object') {
+                //ef_field_permissions
+                if (ef_section_permissions && ef_section_permissions[k] && ef_section_permissions[k][action] === 'denied') {
+                    throw "section没有" + action + "权限,sectionKey=" + k
+                }
+                if(Array.isArray(v)){
+                    for(var i=0; i<v.length; i++){
+                        var r = v[i];
+                        checkObject(r,ef_field_permissions,k,action);
+                    }
+                }
+                else{
+                    checkObject(v,ef_field_permissions,k,action);
+                }
             }
-        }
-        else {
-            if(ef_section_permissions && ef_section_permissions[k] && ef_field_permissions[k].add === 'denied'){
-                throw "字段没有" + action + "权限, key=" + k
+            else {
+                if(ef_section_permissions && ef_section_permissions[k] && ef_field_permissions[k].add === 'denied'){
+                    throw "字段没有" + action + "权限, key=" + k
+                }
             }
-        }
 
+        }
     }
+
 }
 
 function checkUpdatePermission(data,diffresult,permissions,orgId){

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

@@ -114,6 +114,9 @@ function buildSort(sort){
         isRecycleBin = true;
     }
 
+    if(roleId!=='internal'  && roleId!='0'){
+        checkPermission(null,permissions,orgId,"listall");
+    }
 
    var sr =  @projectCodeService.search(mfilters, searchArgs, keyword,from, pageSize, effectiveSort, dataSource ,isRecycleBin );
    var count =  @projectCodeService.count(mfilters, searchArgs, keyword ,isRecycleBin);

package/defaultTemplate/api/src/services/modelService.jsx

@@ -1178,7 +1178,7 @@ var @projectCodeService = (function (pigeon) {
             }
             return 0;
         },
-        executeSearchQuery:function(query){
+        executeSearchQuery:function(query,dataSource){
             var elasticSearchUrl = $.getEnv( "elasticSearchUrl" );
 
             var headers = { "Content-Type": "application/json;charset=utf-8" };

package/package.json

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