From c0c9973e23085eaaf000eddd09d7a664e8057cce Mon Sep 17 00:00:00 2001 From: Hermes Agent Date: Thu, 18 Jun 2026 14:19:14 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20failed=5Faccounting=5Flist.dspy=20JOIN?= =?UTF-8?q?=E6=9D=A1=E4=BB=B6=E4=BF=AE=E6=AD=A3=20-=20users=E8=A1=A8?= =?UTF-8?q?=E4=B8=BB=E9=94=AE=E6=98=AFid=E4=B8=8D=E6=98=AFuserid=20-=20fil?= =?UTF-8?q?ter=E6=A8=A1=E7=B3=8A=E6=90=9C=E7=B4=A2=E6=94=B9=E7=94=A8JOIN?= =?UTF-8?q?=E5=90=8E=E7=9A=84=E8=A1=A8=E5=88=AB=E5=90=8D(u.username,=20l.n?= =?UTF-8?q?ame)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- wwwroot/api/failed_accounting_list.dspy | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/wwwroot/api/failed_accounting_list.dspy b/wwwroot/api/failed_accounting_list.dspy index 11fbe81..4b8357e 100644 --- a/wwwroot/api/failed_accounting_list.dspy +++ b/wwwroot/api/failed_accounting_list.dspy @@ -44,10 +44,10 @@ try: conditions.append("f.use_date<=${end_date}$") ns['end_date'] = filters['end_date'] if filters.get('filter_userid'): - conditions.append("f.userid LIKE ${filter_userid}$") + conditions.append("(u.username LIKE ${filter_userid}$ OR u.name LIKE ${filter_userid}$)") ns['filter_userid'] = '%' + filters['filter_userid'] + '%' if filters.get('filter_llmid'): - conditions.append("(f.llmid LIKE ${filter_llmid}$ OR f.llmid_text LIKE ${filter_llmid}$)") + conditions.append("(f.llmid LIKE ${filter_llmid}$ OR l.name LIKE ${filter_llmid}$)") ns['filter_llmid'] = '%' + filters['filter_llmid'] + '%' where = "" @@ -61,7 +61,7 @@ SELECT f.*, o.orgname as userorgid_text, l.name as llmid_text FROM llmusage_accounting_failed f -LEFT JOIN {sage_db}.users u ON f.userid = u.userid +LEFT JOIN {sage_db}.users u ON f.userid = u.id LEFT JOIN {sage_db}.organization o ON f.userorgid = o.id LEFT JOIN {llmage_db}.llm l ON f.llmid = l.id {where} @@ -71,7 +71,7 @@ ORDER BY f.failed_time DESC count_sql = f""" SELECT count(*) as cnt FROM llmusage_accounting_failed f -LEFT JOIN {sage_db}.users u ON f.userid = u.userid +LEFT JOIN {sage_db}.users u ON f.userid = u.id LEFT JOIN {sage_db}.organization o ON f.userorgid = o.id LEFT JOIN {llmage_db}.llm l ON f.llmid = l.id {where}