fix

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

@@ -24,23 +24,22 @@ class UploadinfoCtl extends trademarkCtl {
      * {"error": ""}
      * {"error": ""}
      */
      */
     async findAndCountAll(p, q, req) {
     async findAndCountAll(p, q, req) {
-        let query = {
-            "actionType": "tmInfo",
-            "actionBody": {}
-        };
-        p.search.trademark_id ={$and:[{$not:null},{$not:""}]};
-        let list = await  this.service.findAndCountAll(p);
-        query.actionBody.tmList = list.results.rows.map(d => {
-            if (d.trademark_id) {
-                return d.trademark_id
-            }
-        });
-        let rtn = {}
+            let query = {
+                "actionType": "tmInfo",
+                "actionBody": {}
+            };
         try {
         try {
-             rtn = await this.execClient.execPost(query, tmurl);
+            p.search.trademark_id = {$and: [{$not: null}, {$not: ""}]};
+            let list = await  this.service.findAndCountAll(p);
+            query.actionBody.tmList = list.results.rows.map(d => {
+                if (d.trademark_id) {
+                    return d.trademark_id
+                }
+            });
         } 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 || [])
     }
     }