合并分支 'workorder' 到 'master'

uuid



查看合并请求 !2283

@@ -71,14 +71,14 @@ class ProjectController extends BaseController
             foreach ($lists['list'] as $k => $v){
             foreach ($lists['list'] as $k => $v){
                 $v = $this->handleParam($v);
                 $v = $this->handleParam($v);
 
 
-//                // 组装 工单UUID
-//                $ticketProject = null;
-//                $ticketProject = DB::table('gl_ticket_projects')
-//                    ->where('table_id', $v['project_id'])
-//                    ->where('project_cate', 2)
-//                    ->first();
-//                $v['uuid'] = $ticketProject ? $ticketProject->uuid : null;
-//                // 组装 工单UUID END
+                // 组装 工单UUID
+                $ticketProject = null;
+                $ticketProject = DB::table('gl_ticket_projects')
+                    ->where('table_id', $v['id'])
+                    ->where('project_cate', 2)
+                    ->first();
+                $v['uuid'] = $ticketProject ? $ticketProject->uuid : null;
+                // 组装 工单UUID END
 
 
                 $lists['list'][$k] = $v;
                 $lists['list'][$k] = $v;
             }
             }