Merge branch 'center-tmtransaction' of gitlab.gongsibao.com:jiangyong/zhichan…

Merge branch 'center-tmtransaction' of gitlab.gongsibao.com:jiangyong/zhichan into center-tmtransaction

center-tmtransaction/app/base/service/impl/tm/trademarktransactionSve.js

@@ -316,13 +316,16 @@ class TrademarktransactionService extends ServiceBase {
       return system.getResultFail(-103, "参数错误");
       return system.getResultFail(-103, "参数错误");
     }
     }
     var ab = pobj.actionBody;
     var ab = pobj.actionBody;
-    if (!ab.channel_code) {
-      return system.getResultFail(-104, "渠道码不能为空");
-    }
+    // 2020 0914 lin 修改 channle_coode为非必填
+    // if (!ab.channel_code) {
+    //   return system.getResultFail(-104, "渠道码不能为空");
+    // }
     var limit = ab.PageSize ? Number(ab.PageSize) : 10;
     var limit = ab.PageSize ? Number(ab.PageSize) : 10;
     var offset = ab.PageNumber ? (Number(ab.PageNumber) - 1) * limit : 0
     var offset = ab.PageNumber ? (Number(ab.PageNumber) - 1) * limit : 0
-    var countObj = { channel_code: ab.channel_code };
-    var whereObj = { channel_code: ab.channel_code };
+    // var countObj = { channel_code: ab.channel_code };
+    // var whereObj = { channel_code: ab.channel_code };
+    var countObj = {  };
+    var whereObj = {  };
     if (ab.excelName) {// 商标名称
     if (ab.excelName) {// 商标名称
       whereObj["excelName"] = { [this.db.Op.like]: "%" + ab.name + "%" };
       whereObj["excelName"] = { [this.db.Op.like]: "%" + ab.name + "%" };
       countObj["excelName"] = { [this.db.Op.like]: "%" + ab.name + "%" };
       countObj["excelName"] = { [this.db.Op.like]: "%" + ab.name + "%" };
@@ -358,6 +361,10 @@ class TrademarktransactionService extends ServiceBase {
         "pic_url",
         "pic_url",
         "excelName",
         "excelName",
         "code",
         "code",
+        "contacts",//联系人
+        "mobile",//联系电话
+        "name",//商标名称
+        "trademark_type_name",
         "ncl_one_code",
         "ncl_one_code",
         "channel_name",
         "channel_name",
         "business_quoted_price",
         "business_quoted_price",