From 9e8293cf051eb314c1315a3c9ca063f455fa7a76 Mon Sep 17 00:00:00 2001 From: qian Date: Mon, 7 Sep 2026 22:18:27 +0800 Subject: [PATCH] =?UTF-8?q?fix(ticket):=E5=B7=A5=E5=8D=95=E5=8F=AA?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E7=AE=A1=E7=90=86=E5=91=98=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E5=90=8D=EF=BC=8C=E4=B8=8D=E6=98=BE=E7=A4=BA=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- internal/logic/admin/ticket.go | 6 +++--- internal/logic/tenant/ticket.go | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/internal/logic/admin/ticket.go b/internal/logic/admin/ticket.go index a2206da..0f1aa0b 100644 --- a/internal/logic/admin/ticket.go +++ b/internal/logic/admin/ticket.go @@ -53,7 +53,7 @@ func (s *sAdmin) ListAllTickets(ctx context.Context, req *v1.TicketListReq) (*v1 LeftJoin("tnt_tenants tt", "spt_tickets.tenant_id = tt.id"). LeftJoin("tnt_users tu", "spt_tickets.user_id = tu.id"). LeftJoin("sys_admin_users sa", "spt_tickets.assigned_admin_id = sa.id"). - Fields("spt_tickets.*, COALESCE(tt.name, '') as tenant_name, COALESCE(tu.display_name, '') as user_display_name, COALESCE(sa.username, '') as assigned_admin_name"). + Fields("spt_tickets.*, COALESCE(tt.name, '') as tenant_name, COALESCE(tu.display_name, '') as user_display_name, COALESCE(sa.display_name, '') as assigned_admin_name"). OrderDesc("spt_tickets.created_at"). Page(page, pageSize). ScanAndCount(&rows, &total, false) @@ -102,7 +102,7 @@ func (s *sAdmin) GetTicketAdmin(ctx context.Context, req *v1.TicketGetReq) (*v1. LeftJoin("tnt_tenants tt", "spt_tickets.tenant_id = tt.id"). LeftJoin("tnt_users tu", "spt_tickets.user_id = tu.id"). LeftJoin("sys_admin_users sa", "spt_tickets.assigned_admin_id = sa.id"). - Fields("spt_tickets.*, COALESCE(tt.name, '') as tenant_name, COALESCE(tu.display_name, '') as user_display_name, COALESCE(sa.username, '') as assigned_admin_name"). + Fields("spt_tickets.*, COALESCE(tt.name, '') as tenant_name, COALESCE(tu.display_name, '') as user_display_name, COALESCE(sa.display_name, '') as assigned_admin_name"). Where("spt_tickets.id", req.Id). Scan(&ticket) if err != nil { @@ -120,7 +120,7 @@ func (s *sAdmin) GetTicketAdmin(ctx context.Context, req *v1.TicketGetReq) (*v1. err = dao.SptReplies.Ctx(ctx). LeftJoin("sys_admin_users sa", "spt_replies.user_type = 'admin' AND spt_replies.user_id = sa.id"). LeftJoin("tnt_users tu", "spt_replies.user_type = 'tenant' AND spt_replies.user_id = tu.id"). - Fields("spt_replies.*, CASE WHEN spt_replies.user_type = 'admin' THEN COALESCE(sa.username, '') ELSE COALESCE(tu.display_name, '') END as user_name"). + Fields("spt_replies.*, CASE WHEN spt_replies.user_type = 'admin' THEN COALESCE(sa.display_name, '') ELSE COALESCE(tu.display_name, '') END as user_name"). Where("spt_replies.ticket_id", req.Id). OrderAsc("spt_replies.created_at"). Scan(&replyRows) diff --git a/internal/logic/tenant/ticket.go b/internal/logic/tenant/ticket.go index 0d3036d..3fc64f9 100644 --- a/internal/logic/tenant/ticket.go +++ b/internal/logic/tenant/ticket.go @@ -47,7 +47,7 @@ func (s *sTenant) TicketList(ctx context.Context, req *v1.TenantTicketListReq) ( items := make([]*v1.TenantTicketItem, 0) listQuery := dao.SptTickets.Ctx(ctx). LeftJoin("sys_admin_users sa", "spt_tickets.assigned_admin_id = sa.id"). - Fields("spt_tickets.*, COALESCE(sa.username, '') as assigned_admin_name"). + Fields("spt_tickets.*, COALESCE(sa.display_name, '') as assigned_admin_name"). Where("spt_tickets.tenant_id", tenantID). Where("spt_tickets.user_id", userID) if req.Status != "" { @@ -92,7 +92,7 @@ func (s *sTenant) TicketGet(ctx context.Context, req *v1.TenantTicketGetReq) (*v var ticket *ticketRow err := dao.SptTickets.Ctx(ctx). LeftJoin("sys_admin_users sa", "spt_tickets.assigned_admin_id = sa.id"). - Fields("spt_tickets.*, COALESCE(sa.username, '') as assigned_admin_name"). + Fields("spt_tickets.*, COALESCE(sa.display_name, '') as assigned_admin_name"). Where("spt_tickets.id", req.Id). Where("spt_tickets.tenant_id", tenantID). Where("spt_tickets.user_id", userID). @@ -113,7 +113,7 @@ func (s *sTenant) TicketGet(ctx context.Context, req *v1.TenantTicketGetReq) (*v err = dao.SptReplies.Ctx(ctx). LeftJoin("sys_admin_users sa", "spt_replies.user_type = 'admin' AND spt_replies.user_id = sa.id"). LeftJoin("tnt_users tu", "spt_replies.user_type = 'tenant' AND spt_replies.user_id = tu.id"). - Fields("spt_replies.*, CASE WHEN spt_replies.user_type = 'admin' THEN COALESCE(sa.username, '') ELSE COALESCE(tu.display_name, '') END as author_name"). + Fields("spt_replies.*, CASE WHEN spt_replies.user_type = 'admin' THEN COALESCE(sa.display_name, '') ELSE COALESCE(tu.display_name, '') END as author_name"). Where("spt_replies.ticket_id", req.Id). OrderAsc("spt_replies.created_at"). Scan(&replyRows) @@ -303,7 +303,7 @@ func (s *sTenant) ExportTickets(ctx context.Context, req *v1.TenantTicketExportR buildQuery := func() *gdb.Model { query := dao.SptTickets.Ctx(ctx). LeftJoin("sys_admin_users sa", "spt_tickets.assigned_admin_id = sa.id"). - Fields("spt_tickets.id, spt_tickets.category, spt_tickets.title, spt_tickets.urgency, spt_tickets.status, COALESCE(sa.username, '') as assigned_admin_name, spt_tickets.created_at"). + Fields("spt_tickets.id, spt_tickets.category, spt_tickets.title, spt_tickets.urgency, spt_tickets.status, COALESCE(sa.display_name, '') as assigned_admin_name, spt_tickets.created_at"). Where("spt_tickets.tenant_id", tenantID). Where("spt_tickets.user_id", userID) if req.Status != "" {