修改请求

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

@@ -40,22 +40,22 @@ class searchCtl extends CtlBase {
                 "nclNum": [],//尼斯大类
                 "nclNum": [],//尼斯大类
             }
             }
         };
         };
-            var tmurl=settings.channelApiUrl();
+        var tmurl = settings.channelApiUrl();
         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";
-                    tmurl=tmurl+"/api/trademark/tmqueryApi/findTrademarkzchAccurate";
+                tmurl = tmurl + "/api/trademark/tmqueryApi/findTrademarkzchAccurate";
                 query.actionBody.regNum = p.search.sbzch
                 query.actionBody.regNum = p.search.sbzch
             } else if (p.search.zcren) {//申请人查询
             } else if (p.search.zcren) {//申请人查询
                 // query.actionType = "findTrademarkzcr";
                 // query.actionType = "findTrademarkzcr";
-                    tmurl=tmurl+"/api/trademark/tmqueryApi/findTrademarkzcr";
+                tmurl = tmurl + "/api/trademark/tmqueryApi/findTrademarkzcr";
                 query.actionBody.regMan = p.search.zcren
                 query.actionBody.regMan = p.search.zcren
             } else if (p.search.sbmc) {//商标名称查询
             } else if (p.search.sbmc) {//商标名称查询
                 // query.actionType = "findTrademarkNameAccurate";
                 // query.actionType = "findTrademarkNameAccurate";
-                    tmurl=tmurl+"/api/trademark/tmqueryApi/findTrademarkNameAccurate";
+                tmurl = tmurl + "/api/trademark/tmqueryApi/findTrademarkNameAccurate";
                 query.actionBody.tmName = p.search.sbmc
                 query.actionBody.tmName = p.search.sbmc
             }
             }
-            } else{
+        } else {
             console.log("===============search====search=======>");
             console.log("===============search====search=======>");
             return;
             return;
         }
         }
@@ -63,10 +63,10 @@ class searchCtl extends CtlBase {
         // console.log("==========================>",tokenInfo)
         // console.log("==========================>",tokenInfo)
         // console.log("==========================>",tokenInfo.data.token)
         // console.log("==========================>",tokenInfo.data.token)
         try {
         try {
-            let rtn = await this.execClient.execPostTK(query, tmurl, "");
-            console.log(rtn,"============rtn==============>");
+            let rtn = await this.execClient.execPostTK(query.actionBody, tmurl, "");
+            console.log(rtn, "============rtn==============>");
             let data = rtn.data;
             let data = rtn.data;
-            let published = await this.service.findAll({company_id: p.company_id});
+            let published = await this.service.findAll({ company_id: p.company_id });
             data.rows.forEach(item => {
             data.rows.forEach(item => {
                 for (let t of published) {
                 for (let t of published) {
                     if (t.tm_code == item.sbzch)
                     if (t.tm_code == item.sbzch)
@@ -74,8 +74,8 @@ class searchCtl extends CtlBase {
                 }
                 }
             });
             });
             return system.getResultList(data.count, data.rows)
             return system.getResultList(data.count, data.rows)
-        }catch (e) {
-            console.log("=======================>",e)
+        } catch (e) {
+            console.log("=======================>", e)
         }
         }
 
 
     }
     }