owl-cli 5.33.0 → 5.36.0

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

@@ -21,35 +21,46 @@
 
     var params = JSON.parse($body);
     var id = params.id;
-
-    var oldObj = @projectCodeService.get(id,true);
-    if(!oldObj){
-        $.log("object not found:" + id);
-        var ret = {
-            state: 'err',
-            msg:'object not found'
-        }
-        out.print(JSON.stringify(ret));
-        return;
+    var ids = params.ids;
+    if(!ids){
+        ids = [id];
     }
-    if(orgId && oldObj._orgIds && oldObj._orgIds){
-        //检查是否有权限修改
-        if(orgId!='0' && oldObj._orgIds.indexOf(orgId)===-1){
+
+    for(var i=0;i<ids.length; i++){
+        var id = ids[i];
+        var oldObj = @projectCodeService.get(id,true);
+        if(!oldObj){
+            $.log("object not found:" + id);
             var ret = {
-                state:'err',
-                code: 'no permission',
-                msg: '没有权限'
+                state: 'err',
+                msg:'object not found, id=' + id
             }
             out.print(JSON.stringify(ret));
             return;
         }
+        if(orgId && oldObj._orgIds && oldObj._orgIds){
+            //检查是否有权限修改
+            if(orgId!='0' && oldObj._orgIds.indexOf(orgId)===-1){
+                var ret = {
+                    state:'err',
+                    code: 'no permission',
+                    msg: '没有权限,id=' + id
+                }
+                out.print(JSON.stringify(ret));
+                return;
+            }
+        }
     }
 
-    var msg = '';
-@projectCodeService.del(id);
+
+    for(var i=0;i<ids.length; i++) {
+        var id = ids[i];
+        @projectCodeService.del(id);
+    }
+
+
     var ret = {
-        state: msg ? 'err' : 'ok',
-        msg: msg
+        state: 'ok'
     }
     out.print(JSON.stringify(ret));
 })();

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

@@ -144,19 +144,6 @@ function buildSort(sort){
     }
   }
 
-  if(m !== '0'){
-    filters = filters.concat([
-      {"term": { "_m.keyword": m }},
-      {"term":{"_t":spec["_t"]}}
-    ]);
-  }
-  else{
-    //如果m === '0'，代表是平台
-    filters = filters.concat([
-      {"term":{"_t":spec["_t"]}}
-    ]);
-  }
-
   if(recycleBin){
     filters.push({"term":{"del.keyword":"T"}});
     var query = {
@@ -207,7 +194,7 @@ function buildSort(sort){
     var basicAuth = "Basic " + auth;
     headers["Authorization"] = basicAuth;
   }
-  var searchUrl = elasticSearchUrl+"/owl_wh_receipt/_search";
+  var searchUrl = elasticSearchUrl+"/@projectCode/_search";
 
   var sndTxt = JSON.stringify(query);
   $.log(sndTxt);
@@ -222,7 +209,7 @@ function buildSort(sort){
   var objs = hits.map(function(hit){return hit._source});
 
 
-  var countUrl = elasticSearchUrl+"/owl_wh_receipt/_count";
+  var countUrl = elasticSearchUrl+"/@projectCode/_count";
 
   var ss = HttpUtils.postRaw( countUrl, sndTxt, headers);
   var cr = JSON.parse(ss);

package/package.json

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