From 5b789995a6dcbcacba4c83a0212e180256a61b19 Mon Sep 17 00:00:00 2001 From: yumoqing Date: Tue, 14 Jul 2026 11:39:34 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20get=5Freseller=5Fsales=E7=BB=9F=E4=B8=80?= =?UTF-8?q?=E6=8C=89=E5=BD=93=E5=89=8D=E6=9C=BA=E6=9E=84=E8=BF=87=E6=BB=A4?= =?UTF-8?q?=E9=94=80=E5=94=AE=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- discount/init.py | 25 ++++++++----------------- 1 file changed, 8 insertions(+), 17 deletions(-) diff --git a/discount/init.py b/discount/init.py index 084192a..3f392d3 100644 --- a/discount/init.py +++ b/discount/init.py @@ -1139,22 +1139,13 @@ async def get_reseller_sales(request): if not userorgid: return [] async with DBPools().sqlorContext('sage') as sor: - if userorgid == '0': - rows = await sor.sqlExe( - """SELECT DISTINCT u.id as sale_id, COALESCE(u.username, u.nick_name, u.id) as sale_name - FROM users u - JOIN userrole ur ON ur.userid = u.id - JOIN role r ON r.id = ur.roleid - WHERE r.name = 'sale' - ORDER BY sale_name""", {}) - else: - rows = await sor.sqlExe( - """SELECT DISTINCT u.id as sale_id, COALESCE(u.username, u.nick_name, u.id) as sale_name - FROM users u - JOIN userrole ur ON ur.userid = u.id - JOIN role r ON r.id = ur.roleid - WHERE r.name = 'sale' AND u.orgid = ${oid}$ - ORDER BY sale_name""", - {'oid': userorgid}) + rows = await sor.sqlExe( + """SELECT DISTINCT u.id as sale_id, COALESCE(u.username, u.nick_name, u.id) as sale_name + FROM users u + JOIN userrole ur ON ur.userid = u.id + JOIN role r ON r.id = ur.roleid + WHERE r.name = 'sale' AND u.orgid = ${oid}$ + ORDER BY sale_name""", + {'oid': userorgid}) return [{'value': r.sale_id, 'text': r.sale_name} for r in rows]