owl-cli 5.36.0 → 5.39.0

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

@@ -15,7 +15,7 @@ var spec = @spec;
 
 function buildSort(sort){
   if(!sort){
-    return null;
+    return {};
   }
   var result = [];
   for(var k in sort){
@@ -208,13 +208,16 @@ function buildSort(sort){
 
   var objs = hits.map(function(hit){return hit._source});
 
-
+  delete query.from;
+  delete query.size;
+  delete query.sort;
+  sndTxt = JSON.stringify(query);
   var countUrl = elasticSearchUrl+"/@projectCode/_count";
 
   var ss = HttpUtils.postRaw( countUrl, sndTxt, headers);
   var cr = JSON.parse(ss);
 
-  var count = result.count;
+  var count = cr.count;
 //这里重新从pigeon取了一次数据，做了删除的判断
 // var ids = hits.map(function(hit){return hit._source.id});
 // var list = owl_wh_receiptService.getObjects(ids);

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

@@ -877,7 +877,7 @@ var @projectCodeService = (function (pigeon) {
             var filters = [];
             var must_not = [{
                 term:{
-                    del:'T'
+                    "del.keyword":'T'
                 }
             }];
             for(var k in searchArgs){

package/package.json

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