gsb

xggsve-uc/app/base/db/impl/user/saasmerchantuserDao.js

@@ -30,11 +30,21 @@ class SaasMerchantUserDao extends Dao {
   }
 
   async byUcname(ucname, merchantId) {
-    var sql = "SELECT * FROM uc_user WHERE ucname = :ucname AND saas_merchant_id = :merchantId AND deleted_at IS NULL";
-    var list = await this.customQuery(sql, {
-      ucname: ucname,
-      merchantId: merchantId,
-    });
+    let sql = [];
+    sql.push("SELECT");
+    sql.push("*");
+    sql.push("FROM");
+    sql.push(this.model.tableName);
+    sql.push("WHERE ucname = :ucname");
+    let param = {ucname: ucname};
+
+    if(merchantId) {
+      sql.push("AND saas_merchant_id = :merchantId");
+      param.merchantId = merchantId;
+    }
+    sql.push("AND deleted_at IS NULL");
+
+    var list = await this.customQuery(sql.join(" "), param);
     if (!list || list.length == 0) {
       return null;
     }