fix

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

@@ -24,6 +24,8 @@ class searchCtl extends CtlBase {
      * {"error": ""}
      * {"error": ""}
      */
      */
     async findAndCountAll(p, q, req) {
     async findAndCountAll(p, q, req) {
+        try {
+
             let query = {
             let query = {
                 "actionType": "",
                 "actionType": "",
                 "actionBody": {
                 "actionBody": {
@@ -40,7 +42,7 @@ class searchCtl extends CtlBase {
                     "nclNum": [],//尼斯大类
                     "nclNum": [],//尼斯大类
                 }
                 }
             };
             };
-        if (Object.keys(p.search).length>0) {
+            if (Object.keys(p.search).length > 0) {
                 if (p.search.sbzch) {//注册号查询
                 if (p.search.sbzch) {//注册号查询
                     query.actionType = "findTrademarkzchAccurate";
                     query.actionType = "findTrademarkzchAccurate";
                     query.actionBody.regNum = p.search.sbzch
                     query.actionBody.regNum = p.search.sbzch
@@ -51,18 +53,21 @@ class searchCtl extends CtlBase {
                     query.actionType = "findTrademarkNameAccurate";
                     query.actionType = "findTrademarkNameAccurate";
                     query.actionBody.tmName = p.search.sbmc
                     query.actionBody.tmName = p.search.sbmc
                 }
                 }
-        }else return;
+            } else return;
             let tokenInfo = await this.service.getToken();
             let tokenInfo = await this.service.getToken();
-        let rtn = await this.execClient.execPostTK(query, tmurl,tokenInfo.data.token);
+            let rtn = await this.execClient.execPostTK(query, tmurl, tokenInfo.data.token);
             let data = rtn.data;
             let data = rtn.data;
-        let published = await this.service.findAll({company_id:p.company_id});
-        data.rows.forEach(item=>{
-            for (let t of published){
+            let published = await this.service.findAll({company_id: p.company_id});
+            data.rows.forEach(item => {
+                for (let t of published) {
                     if (t.tm_code == item.sbzch)
                     if (t.tm_code == item.sbzch)
                         item._disabled = true;
                         item._disabled = true;
                 }
                 }
             });
             });
-        return system.getResultList(data.count,data.rows)
+            return system.getResultList(data.count, data.rows)
+        }catch (e) {
+            return system.getResultFail(-1, e)
+        }
     }
     }
 }
 }