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

修改项目获取渠道信息



查看合并请求 !969

@@ -764,7 +764,7 @@ class ProjectController extends BaseController
                 $domain_array = parse_url($domain_pro ? $domain_pro->domain : '');
                 $domain_array = parse_url($domain_pro ? $domain_pro->domain : '');
                 $domain = $domain_array['host'] ?? $domain_array['path'];
                 $domain = $domain_array['host'] ?? $domain_array['path'];
             }
             }
-            $manage = new Manage();
+            $manageHr = new ManageHr();
             $param = [
             $param = [
                   "id" => $item['id'],
                   "id" => $item['id'],
                   "title" => $item['title'],
                   "title" => $item['title'],
@@ -786,9 +786,9 @@ class ProjectController extends BaseController
 //                  "online_time" => $item['online_check']['qa_check_time'] ?? '',
 //                  "online_time" => $item['online_check']['qa_check_time'] ?? '',
                   "online_time" => $item['uptime'] ?? '',
                   "online_time" => $item['uptime'] ?? '',
                   "cooperate_date" => $item['cooperate_date'],
                   "cooperate_date" => $item['cooperate_date'],
-                  "project_manager_name" => $manage->getName($item['deploy_build']['manager_mid']), //项目经理
-                  "after_sales_manager_name" => $manage->getName($item['deploy_optimize']['manager_mid']), //售后服务经理
-                  "leader_name" => $manage->getName($item['deploy_build']['leader_mid']), //组长
+                  "project_manager_name" => $manageHr->getName($item['deploy_build']['manager_mid']), //项目经理
+                  "after_sales_manager_name" => $manageHr->getName($item['deploy_optimize']['manager_mid']), //售后服务经理
+                  "leader_name" => $manageHr->getName($item['deploy_build']['leader_mid']), //组长
             ];
             ];
             if ($item['type'] == Project::TYPE_TWO) {
             if ($item['type'] == Project::TYPE_TWO) {
                 $param['is_compliance'] = RankData::where('project_id', $item['id'])->where('lang', '')->value('is_compliance') ?: 0;
                 $param['is_compliance'] = RankData::where('project_id', $item['id'])->where('lang', '')->value('is_compliance') ?: 0;