合并分支 'workorder' 到 'master'

wor



查看合并请求 !2281

@@ -37,6 +37,7 @@ use App\Models\RankData\RankData;
 use App\Models\Task\Task;
 use App\Models\WebSetting\WebLanguage;
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\DB;
 
 /**
  * 项目管理
@@ -69,6 +70,16 @@ class ProjectController extends BaseController
         if(!empty($lists) && !empty($lists['list'])){
             foreach ($lists['list'] as $k => $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
+
                 $lists['list'][$k] = $v;
             }
         }