fix

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

@@ -24,12 +24,11 @@ class UploadinfoCtl extends trademarkCtl {
      * {"error": ""}
      * {"error": ""}
      */
      */
     async findAndCountAll(p, q, req) {
     async findAndCountAll(p, q, req) {
-        try {
         let query = {
         let query = {
             "actionType": "tmInfo",
             "actionType": "tmInfo",
             "actionBody": {}
             "actionBody": {}
         };
         };
-            p.search.trademark_id = {$and: [{$not: null}, {$not: ""}]};
+        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) {
@@ -39,9 +38,6 @@ class UploadinfoCtl extends trademarkCtl {
         let rtn = await this.execClient.execPost(query, tmurl);
         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 || [])
-        } catch (e) {
-            return system.getResultFail(-2,e)
-        }
     }
     }
 }
 }