合并分支 'workorder' 到 'master'

Workorder



查看合并请求 !2377

@@ -148,7 +148,7 @@ class TicketController extends BaseController
             'first_engineer',
             'first_engineer',
         ])
         ])
             ->where('uuid', $project_id)->first();
             ->where('uuid', $project_id)->first();
-        if (!$project) return $this->response('未找到项目', 404);
+        if (!$project) return response()->json(['message' => '未找到对应的工单项目'], 404);
         return response()->json(['data' => $project]);
         return response()->json(['data' => $project]);
     }
     }
 
 

@@ -26,7 +26,7 @@ class TicketProject extends Base
     public function pm()
     public function pm()
     {
     {
         return $this->hasOne(ManageHr::class, 'manage_id', 'pm_id')
         return $this->hasOne(ManageHr::class, 'manage_id', 'pm_id')
-//            ->where('pm_id', '>', 0)
+            ->where('manage_id', '>', 0)
             ->select(['manage_id', 'name', 'nickname']);
             ->select(['manage_id', 'name', 'nickname']);
     }
     }
 
 
@@ -34,7 +34,7 @@ class TicketProject extends Base
     public function assm()
     public function assm()
     {
     {
         return $this->hasOne(ManageHr::class, 'manage_id', 'assm_id')
         return $this->hasOne(ManageHr::class, 'manage_id', 'assm_id')
-//            ->where('assm_id', '>', 0)
+            ->where('manage_id', '>', 0)
             ->select(['manage_id', 'name', 'nickname']);
             ->select(['manage_id', 'name', 'nickname']);
     }
     }
 
 
@@ -42,7 +42,7 @@ class TicketProject extends Base
     public function seom()
     public function seom()
     {
     {
         return $this->hasOne(ManageHr::class, 'manage_id', 'seom_id')
         return $this->hasOne(ManageHr::class, 'manage_id', 'seom_id')
-//            ->where('seom_id', '>', 0)
+            ->where('manage_id', '>', 0)
             ->select(['manage_id', 'name', 'nickname']);
             ->select(['manage_id', 'name', 'nickname']);
     }
     }
 
 
@@ -52,7 +52,7 @@ class TicketProject extends Base
     public function first_engineer()
     public function first_engineer()
     {
     {
         return $this->hasOne(ManageHr::class, 'manage_id', 'engineer_id')
         return $this->hasOne(ManageHr::class, 'manage_id', 'engineer_id')
-//            ->where('engineer_id', '>', 0)
+            ->where('manage_id', '>', 0)
             ->select(['manage_id', 'name', 'nickname']);
             ->select(['manage_id', 'name', 'nickname']);
     }
     }