yumoqing/discount
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: get_reseller_sales统一按当前机构过滤销售列表

Browse Source
This commit is contained in:
yumoqing 2026-07-14 11:39:34 +08:00
parent 6c0f5a6572
commit 5b789995a6
1 changed files with 8 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
discount/init.py
View File

@ -1139,22 +1139,13 @@ async def get_reseller_sales(request):
if not userorgid: if not userorgid:
return [] return []
async with DBPools().sqlorContext('sage') as sor: async with DBPools().sqlorContext('sage') as sor:
if userorgid == '0': rows = await sor.sqlExe(
rows = await sor.sqlExe( """SELECT DISTINCT u.id as sale_id, COALESCE(u.username, u.nick_name, u.id) as sale_name
"""SELECT DISTINCT u.id as sale_id, COALESCE(u.username, u.nick_name, u.id) as sale_name FROM users u
FROM users u JOIN userrole ur ON ur.userid = u.id
JOIN userrole ur ON ur.userid = u.id JOIN role r ON r.id = ur.roleid
JOIN role r ON r.id = ur.roleid WHERE r.name = 'sale' AND u.orgid = ${oid}$
WHERE r.name = 'sale' ORDER BY sale_name""",
ORDER BY sale_name""", {}) {'oid': userorgid})
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})
return [{'value': r.sale_id, 'text': r.sale_name} for r in rows] return [{'value': r.sale_id, 'text': r.sale_name} for r in rows]