合并分支 'workorder' 到 'master'

where(status, 1)->



查看合并请求 !2429

@@ -82,9 +82,9 @@ class FetchTicketProjects extends Command
                     elseif ($item['cate'] == "建站中")
                         $status=1; // 建站中
 
-                    $assm_id = Manage::where('name', $item['assm'])->value('id') ?? Manage::where('name', '张鸿飞')->value('id') ?? 0;  //售后服务经理
-                    $seom_id = Manage::where('name', $item['yhs'])->value('id') ?? Manage::where('name', '陶婵')->value('id') ?? 0;  //优化师
-                    $pm_id = Manage::where('name', $item['pm'])->value('id') ?? Manage::where('name', '李洁玉')->value('id') ?? 0; // 项目经理
+                    $assm_id = ManageHr::where('name', $item['assm'])->where('status', 1)->value('manage_id') ?? ManageHr::where('name', '张鸿飞')->where('status', 1)->value('manage_id') ?? 0;  //售后服务经理
+                    $seom_id = ManageHr::where('name', $item['yhs'])->where('status', 1)->value('manage_id') ?? ManageHr::where('name', '陶婵')->where('status', 1)->value('manage_id') ?? 0;  //优化师
+                    $pm_id = ManageHr::where('name', $item['pm'])->where('status', 1)->value('manage_id') ?? ManageHr::where('name', '李洁玉')->where('status', 1)->value('manage_id') ?? 0; // 项目经理
 
                     /**
                      * 第一负责人逻即说明：
@@ -110,7 +110,7 @@ class FetchTicketProjects extends Command
                         $item['yhszl'],
                     ];
                     // 过滤掉空值,去掉重复
-                    $team_ids = ManageHr::whereIn('name', $team_names)->pluck('manage_id')
+                    $team_ids = ManageHr::whereIn('name', $team_names)->where('status', 1)->pluck('manage_id')
                         ->unique()
                         ->filter(fn($v) => !is_null($v) && $v !== 0)
                         ->values()
@@ -203,22 +203,22 @@ class FetchTicketProjects extends Command
 
                     // 售后服务经理
                     $assm_id = collect([
-                        ManageHr::find($item->deploy_optimize->manager_mid)->manage_id ?? 0,
-                        ManageHr::find($item->deploy_optimize->tech_leader)->manage_id ?? 0,
+                        ManageHr::where('status', 1)->find($item->deploy_optimize->manager_mid)->manage_id ?? 0,
+                        ManageHr::where('status', 1)->find($item->deploy_optimize->tech_leader)->manage_id ?? 0,
                         8,  //张鸿飞
                     ])->first(fn($v) => $v !== null && $v !== 0, 0);
 
                     // 优化师
-                    $seom_id = ManageHr::find($item->deploy_optimize->optimist_mid) ? ManageHr::find($item->deploy_optimize->optimist_mid)->manage_id : 0;
+                    $seom_id = ManageHr::where('status', 1)->find($item->deploy_optimize->optimist_mid) ? ManageHr::where('status', 1)->find($item->deploy_optimize->optimist_mid)->manage_id : 0;
 
                     // 项目经理
-                    $pm_id = ManageHr::find($item->deploy_build->manager_mid)->manage_id ?? ManageHr::where('name', '李洁玉')->value('manage_id') ?? 0;
+                    $pm_id = ManageHr::where('status', 1)->find($item->deploy_build->manager_mid)->manage_id ?? ManageHr::where('status', 1)->where('name', '李洁玉')->value('manage_id') ?? 0;
 
                     // 第一负责人
                     if ($status == 1)
                         $engineer_id = $pm_id; // 建站中找项目经理
                     elseif ($status == 2)
-                        $engineer_id = Manage::where('name', '杨长远')->value('id') ?? 0; // 建站完成找杨长远
+                        $engineer_id = Manage::where('status', 1)->where('name', '杨长远')->value('id') ?? 0; // 建站完成找杨长远
                     else
                         $engineer_id = $assm_id; // 推广找售后服务经理
 
@@ -324,14 +324,14 @@ class FetchTicketProjects extends Command
                         {
                             // 售后服务经理
                             $assm_id = collect([
-                                ManageHr::where('name', $item['cj_assm']['real_name'] ?? '')->first()->manage_id ?? 0,
+                                ManageHr::where('status', 1)->where('name', $item['cj_assm']['real_name'] ?? '')->first()->manage_id ?? 0,
                                 20,  //徐莹
                             ])->first(fn($v) => $v !== null && $v !== 0, 0);
                         }else
                         {
                             // 域途
                             $assm_id = collect([
-                                ManageHr::where('name', $item['yutu_assm']['real_name'] ?? '')->first()->manage_id ?? 0,
+                                ManageHr::where('status', 1)->where('name', $item['yutu_assm']['real_name'] ?? '')->first()->manage_id ?? 0,
                                 85,  //黄小玉
                             ])->first(fn($v) => $v !== null && $v !== 0, 0);
                         }