fix

zhiquanquan/app/base/controller/impl/trademark/uploadinfoCtl.js

@@ -28,19 +28,18 @@ class UploadinfoCtl extends trademarkCtl {
                 "actionType": "tmInfo",
                 "actionType": "tmInfo",
                 "actionBody": {}
                 "actionBody": {}
             };
             };
-        p.search.trademark_id ={$and:[{$not:null},{$not:""}]};
+        try {
+            p.search.trademark_id = {$and: [{$not: null}, {$not: ""}]};
             let list = await  this.service.findAndCountAll(p);
             let list = await  this.service.findAndCountAll(p);
             query.actionBody.tmList = list.results.rows.map(d => {
             query.actionBody.tmList = list.results.rows.map(d => {
                 if (d.trademark_id) {
                 if (d.trademark_id) {
                     return d.trademark_id
                     return d.trademark_id
                 }
                 }
             });
             });
-        let rtn = {}
-        try {
-             rtn = await this.execClient.execPost(query, tmurl);
         } catch (e) {
         } catch (e) {
-            return system.getResultFail(-2,e)
+            console.error(e)
         }
         }
+        let rtn = await this.execClient.execPost(query, tmurl);
         let data = JSON.parse(rtn.stdout);
         let data = JSON.parse(rtn.stdout);
         return system.getResultList(data.totalCount, data.data || [])
         return system.getResultList(data.totalCount, data.data || [])
     }
     }