d

xggsve-merchant/app/base/db/impl/channel/saaschannelDao.js

@@ -35,5 +35,15 @@ class SaasChannelDao extends Dao {
       saasId: saasId
       saasId: saasId
     });
     });
   }
   }
+
+  async findDics(params){
+    let sql = [];
+    sql.push("select * from saas_channel where 1=1");
+    if(params.name){
+      params.nameLike = `%${params.name}%`;
+      sql.push("and name like :nameLike");
+    }
+    return await this.customQuery(sql.join(" "), params);
+  }
 }
 }
 module.exports = SaasChannelDao;
 module.exports = SaasChannelDao;

xggsve-merchant/app/base/service/impl/channel/saaschannelSve.js

@@ -8,14 +8,16 @@ class SaasChannelService extends ServiceBase {
   // -----------------------以此间隔，上面为API，下面为service---------------------------------
   // -----------------------以此间隔，上面为API，下面为service---------------------------------
 
 
   async dics(params) {
   async dics(params) {
-    let saas_id = Number(this.trim(params.saas_id) || 0);
-    if (!saas_id) {
-      return system.getResultSuccess([]);
+    try{
+      let list = await this.dao.findDics(params);
+      return system.getResult(list);
+    }catch (e) {
+      console.log(e);
+      return system.getResult(null,`系统错误`)
     }
     }
-    let list = await this.dao.bySaasId(Number(params.saas_id), "id, name, short_name");
-    return system.getResultSuccess(list);
   }
   }
 
 
+
   async info(params) {
   async info(params) {
     if (!params.id) {
     if (!params.id) {
       return system.getResult(null, "id不存在");
       return system.getResult(null, "id不存在");
@@ -160,17 +162,15 @@ class SaasChannelService extends ServiceBase {
   async pageByCondition(params) {
   async pageByCondition(params) {
     var currentPage = Number(params.currentPage || 0);
     var currentPage = Number(params.currentPage || 0);
     var pageSize = Number(params.pageSize || 10);
     var pageSize = Number(params.pageSize || 10);
-
-    var where = {
-      saas_id: params.saas_id,
-    };
-
+    var where = {};
+    if(params.saas_id){
+      where.saas_id = params.saas_id;
+    }
     if (params.name) {
     if (params.name) {
       where.name = {
       where.name = {
         [this.db.Op.like]: "%" + params.name + "%"
         [this.db.Op.like]: "%" + params.name + "%"
       };
       };
     }
     }
-
     // this.addWhereTime(where, 'created_at', params.createdBegin, params.createdEnd, true);
     // this.addWhereTime(where, 'created_at', params.createdBegin, params.createdEnd, true);
     var orderby = [
     var orderby = [
       ["id", 'desc']
       ["id", 'desc']