合并分支 'lyh-server' 到 'master'

超过120小时未处理的工单



查看合并请求 !2694

@@ -155,13 +155,7 @@ class AsideTicketController extends BaseController
         $ticketsModel = new Tickets();
         $ticketsModel = new Tickets();
         $query = $ticketsModel->leftJoin('gl_ticket_projects', 'gl_ticket_projects.id', '=', 'gl_tickets.project_id')
         $query = $ticketsModel->leftJoin('gl_ticket_projects', 'gl_ticket_projects.id', '=', 'gl_tickets.project_id')
             ->leftJoin('gl_ticket_logs', 'gl_ticket_logs.ticket_id', '=', 'gl_tickets.id')
             ->leftJoin('gl_ticket_logs', 'gl_ticket_logs.ticket_id', '=', 'gl_tickets.id')
-            ->select([
-                'gl_tickets.*',
-                'gl_ticket_projects.title as project_title',
-                'gl_ticket_projects.company_name as project_company',
-                'gl_ticket_projects.status as project_status',
-                'gl_ticket_projects.project_cate as project_cate',
-            ])
+            ->select('gl_tickets.*', 'gl_ticket_logs.*', 'gl_ticket_projects.*')
             ->distinct(); // 避免多条 logs 时数据重复
             ->distinct(); // 避免多条 logs 时数据重复
 
 
         // 工程师过滤
         // 工程师过滤