diff --git a/KJD_WebService/BLL/WXXD/WXOemManage.cs b/KJD_WebService/BLL/WXXD/WXOemManage.cs
index b2e8eca..2530d05 100644
--- a/KJD_WebService/BLL/WXXD/WXOemManage.cs
+++ b/KJD_WebService/BLL/WXXD/WXOemManage.cs
@@ -580,7 +580,7 @@ namespace KJD_Web.BLL.WXXD
/// 各项金额之和为总金额(元),写入 oem.available_balance(当前可提现);
/// 其中正数部分累计到 oem.total_rebate_amount(历史累计返利)。
/// 写oem金额与更新流水settlement=1在同一个事务内执行(由调用方开启的事务)。
- ///
+ ///
/// 事务连接(调用方已开启事务)
/// 贴牌编号(wxxd.oem.oem_id / wxxd.user.oem_id)
/// wxxd.oem.id 数字主键
@@ -590,7 +590,17 @@ namespace KJD_Web.BLL.WXXD
if (oem_id.IsNullOrEmpty())
return 0;
// 1. 找到该oem下所有账户
- string sql = "SELECT b.user_name FROM `wxxd`.`user` AS A LEFT JOIN `wxxd`.`user` AS B ON A.user_name = B.parent_user_name WHERE A.oem_id='" + MysqlUtils.ReplaceSqlSpecial(oem_id) + "'";
+ string sql = $@"SELECT user_name, '主账号' AS account_type
+ FROM `wxxd`.`user`
+ WHERE oem_id = '{MysqlUtils.ReplaceSqlSpecial(oem_id)}'
+ UNION
+ SELECT
+ B.user_name,
+ '子账号' AS account_type
+ FROM `wxxd`.`user` AS A
+ INNER JOIN `wxxd`.`user` AS B
+ ON A.user_name = B.parent_user_name
+ WHERE A.oem_id = '{MysqlUtils.ReplaceSqlSpecial(oem_id)}'";
var userDt = mySql.ExecuteDataTable(sql);
if (!string.IsNullOrEmpty(mySql.Message) || userDt == null || userDt.Rows.Count == 0)
return 0;
diff --git a/test/WebServiceTest/App.config b/test/WebServiceTest/App.config
index 0c4a326..7e99579 100644
--- a/test/WebServiceTest/App.config
+++ b/test/WebServiceTest/App.config
@@ -5,7 +5,10 @@
-->
-
+
+
+
+
diff --git a/test/WebServiceTest/UnitTest1.cs b/test/WebServiceTest/UnitTest1.cs
index 7b0624f..f52da4e 100644
--- a/test/WebServiceTest/UnitTest1.cs
+++ b/test/WebServiceTest/UnitTest1.cs
@@ -84,7 +84,6 @@ namespace WebServiceTest
var ret = manage.AuditOemWithdrawal(new KJD_Web.BLL.WXXD.Requests.OemWithdrawalAuditRequest
{
withdrawal_no = "TX202608261403434589545",
- audit_by = UserName,
audit_result = 1
});
Console.WriteLine(ret);