Commit 69fe1d88 by 王悦

fix

parent e47b3222
......@@ -24,11 +24,12 @@ class UploadinfoCtl extends trademarkCtl {
* {"error": ""}
*/
async findAndCountAll(p, q, req) {
try {
let query = {
"actionType": "tmInfo",
"actionBody": {}
};
p.search.trademark_id ={$and:[{$not:null},{$not:""}]};
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) {
......@@ -38,6 +39,9 @@ class UploadinfoCtl extends trademarkCtl {
let rtn = await this.execClient.execPost(query, tmurl);
let data = JSON.parse(rtn.stdout);
return system.getResultList(data.totalCount, data.data || [])
} catch (e) {
return system.getResultFail(-2,e)
}
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment