gsb

bpo-channel/app/base/service/impl/channel/channelmerchantSve.js

@@ -107,6 +107,7 @@ class ChannelmerchantService extends ServiceBase {
         where.origin_merchant_id = "";
         where.origin_merchant_id = "";
         where.origin_merchant_name = "";
         where.origin_merchant_name = "";
     }
     }
+
     let orderby = [
     let orderby = [
       ["id", 'desc']
       ["id", 'desc']
     ];
     ];
@@ -116,11 +117,32 @@ class ChannelmerchantService extends ServiceBase {
       for (var row of page.rows) {
       for (var row of page.rows) {
         this.handleDate(row, ["created_at"], null, -8);
         this.handleDate(row, ["created_at"], null, -8);
       }
       }
+
+      if(params.types != 1){
+        await this.setpage(page)
+      }
       await this.setChannelInfo(page.rows);
       await this.setChannelInfo(page.rows);
+
     }
     }
     return system.getResultSuccess(page);
     return system.getResultSuccess(page);
   }
   }
 
 
+
+  async setpage(page){
+    var rows = page.rows;
+    if (!rows || rows.length == 0) {
+      return;
+    }
+    var row = [];
+    for (var i=0;i<rows.length; i++){
+      if(rows[i].origin_merchant_id != "" ){
+        row.push(rows[i]);
+      }
+    }
+    page.rows = row;
+    page.count = row.length;
+  }
+
   async setChannelInfo(rows) {
   async setChannelInfo(rows) {
     if (!rows || rows.length == 0) {
     if (!rows || rows.length == 0) {
       return;
       return;