fix

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

@@ -24,24 +24,20 @@ class UploadinfoCtl extends trademarkCtl {
      * {"error": ""}
      * {"error": ""}
      */
      */
     async findAndCountAll(p, q, req) {
     async findAndCountAll(p, q, req) {
-            let query = {
-                "actionType": "tmInfo",
-                "actionBody": {}
-            };
-        try {
-            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) {
-            console.error(e)
-        }
+        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 = 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(list.results.count, data.data || [])
     }
     }
 }
 }