channel

fqboss/app/base/service/impl/tmflowSve.js

@@ -427,7 +427,7 @@ class TmFlowService extends ServiceBase {
   async opBeehiveOfficial(self, updateFailed, user, fileName, fileType, objItem, reg_code, officialType, opType) {
   async opBeehiveOfficial(self, updateFailed, user, fileName, fileType, objItem, reg_code, officialType, opType) {
     //默认失败
     //默认失败
     var opResult = { code: -1, data: null, isMobileMsg: 0 };
     var opResult = { code: -1, data: null, isMobileMsg: 0 };
-    var tmList = await this.connectionbhop.query("SELECT id,momo,nclone_id,mark_state,trade_mark_caseid FROM `ig_trade_mark` WHERE `code`='" + reg_code + "' LIMIT 1");
+    var tmList = null;//await this.connectionbhop.query("SELECT id,momo,nclone_id,mark_state,trade_mark_caseid FROM `ig_trade_mark` WHERE `code`='" + reg_code + "' LIMIT 1");
     if (tmList && tmList[0, 0].length > 0) {
     if (tmList && tmList[0, 0].length > 0) {
       var tmItem = tmList[0, 0][0];
       var tmItem = tmList[0, 0][0];
       opResult.code = 1;
       opResult.code = 1;

fqboss/app/base/service/impl/trademarkSve.js

@@ -184,7 +184,7 @@ class TrademarkService extends ServiceBase {
       + "c.`mobile`,c.`fax`,c.`zipCode`,b.`businessLicensePic`,b.`identityCard`,b.`identityCardPic`,a.`tmFormType`,a.`voiceUrl`,a.`tmName`,a.`nclOneCodes`,a.`nclSmallCodes`,"
       + "c.`mobile`,c.`fax`,c.`zipCode`,b.`businessLicensePic`,b.`identityCard`,b.`identityCardPic`,a.`tmFormType`,a.`voiceUrl`,a.`tmName`,a.`nclOneCodes`,a.`nclSmallCodes`,"
       + "a.`picUrl`,a.`colorizedPicUrl`,a.`descUrl` "
       + "a.`picUrl`,a.`colorizedPicUrl`,a.`descUrl` "
       + " FROM `h_trade_mark` AS a,`h_tmapplier_info` AS b,`h_tmcustomer_info` AS c "
       + " FROM `h_trade_mark` AS a,`h_tmapplier_info` AS b,`h_tmcustomer_info` AS c "
-      + " WHERE a.`orderNum`=b.`orderNum` AND a.`orderNum`=c.`orderNum` and a.tmSourceType IN ('16', '64', '128', '256','512','1024') "
+      + " WHERE a.`orderNum`=b.`orderNum` AND a.`orderNum`=c.`orderNum` and a.tmSourceType IN ('16', '64', '128', '256','512','1024','2048','4096') "
       + " AND a.`deleted_at` IS NULL AND a.`tmStatus` = 'WAITCOMMIT' ORDER BY a.id ASC LIMIT " + pageSize + " OFFSET " + from;
       + " AND a.`deleted_at` IS NULL AND a.`tmStatus` = 'WAITCOMMIT' ORDER BY a.id ASC LIMIT " + pageSize + " OFFSET " + from;
 
 
     var tmpdbResult = await this.dao.customQuery(sql);
     var tmpdbResult = await this.dao.customQuery(sql);