gx

@@ -5,6 +5,7 @@ namespace App\Http\Controllers\Aside\Optimize;
 use App\Enums\Common\Code;
 use App\Enums\Common\Code;
 use App\Http\Controllers\Aside\BaseController;
 use App\Http\Controllers\Aside\BaseController;
 use App\Http\Logic\Aside\Optimize\OptimizeLogic;
 use App\Http\Logic\Aside\Optimize\OptimizeLogic;
+use App\Models\Manage\Manage;
 use App\Models\Project\Project;
 use App\Models\Project\Project;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\DB;
 
 
@@ -30,8 +31,11 @@ class OptimizeController extends BaseController
         $query = $this->searchParam($query);
         $query = $this->searchParam($query);
         $lists = $query->paginate($this->row, $this->selectParam(), 'page', $this->page)->toArray();
         $lists = $query->paginate($this->row, $this->selectParam(), 'page', $this->page)->toArray();
         if(!empty($lists['list'])){
         if(!empty($lists['list'])){
+            $manager = new Manage();
             foreach ($lists['list'] as $k => $v){
             foreach ($lists['list'] as $k => $v){
                 $v['plan'] = $project::planMap()[$v['plan']];
                 $v['plan'] = $project::planMap()[$v['plan']];
+                $v['optimist_mid_name'] = $manager->read(['id'=>$v['optimist_mid']])['name'];
+                $v['tech_mid_name'] = $manager->read(['id'=>$v['tech_mid']])['name'];
                 $lists['list'][$k] = $v;
                 $lists['list'][$k] = $v;
             }
             }
         }
         }

@@ -48,6 +48,7 @@ class ProjectLogic extends BaseLogic
 
 
         parent::setWith(['payment', 'deploy_build', 'deploy_optimize','online_check']);
         parent::setWith(['payment', 'deploy_build', 'deploy_optimize','online_check']);
         $list =  parent::getList($map, $sort, ['id', 'title', 'channel','cooperate_date' ,'type', 'created_at'], $limit);
         $list =  parent::getList($map, $sort, ['id', 'title', 'channel','cooperate_date' ,'type', 'created_at'], $limit);
+        $managerLogic = new ManageLogic();
         foreach ($list['list'] as &$item){
         foreach ($list['list'] as &$item){
             $item = [
             $item = [
                 'id' => $item['id'],
                 'id' => $item['id'],
@@ -56,14 +57,14 @@ class ProjectLogic extends BaseLogic
                 'key' => $item['deploy_build']['keyword_num'] ?? 0,
                 'key' => $item['deploy_build']['keyword_num'] ?? 0,
                 'day' => $item['deploy_build']['service_duration'] ?? 0,
                 'day' => $item['deploy_build']['service_duration'] ?? 0,
                 'amount' => $item['payment']['amount'] ?? 0,
                 'amount' => $item['payment']['amount'] ?? 0,
-                'build_leader' => (new ManageLogic)->getCacheName($item['deploy_build']['leader_mid'] ?? 0), //组长
-                'build_manager' => (new ManageLogic)->getCacheName($item['deploy_build']['manager_mid'] ?? 0), //项目经理
-                'build_designer' => (new ManageLogic)->getCacheName($item['deploy_build']['designer_mid'] ?? 0), //设计师
-                'build_tech' => (new ManageLogic)->getCacheName($item['deploy_build']['tech_mid'] ?? 0), //技术助理
-                'optimize_manager' => (new ManageLogic)->getCacheName($item['deploy_optimize']['manager_mid'] ?? 0), //优化服务经理
-                'optimize_optimist' => (new ManageLogic)->getCacheName($item['deploy_optimize']['optimist_mid'] ?? 0), //优化师
-                'optimize_assist' => (new ManageLogic)->getCacheName($item['deploy_optimize']['assist_mid'] ?? 0), //优化助理
-                'optimize_tech' => (new ManageLogic)->getCacheName($item['deploy_optimize']['tech_mid'] ?? 0), //售后技术
+                'build_leader' => $managerLogic->getCacheName($item['deploy_build']['leader_mid'] ?? 0), //组长
+                'build_manager' => $managerLogic->getCacheName($item['deploy_build']['manager_mid'] ?? 0), //项目经理
+                'build_designer' => $managerLogic->getCacheName($item['deploy_build']['designer_mid'] ?? 0), //设计师
+                'build_tech' => $managerLogic->getCacheName($item['deploy_build']['tech_mid'] ?? 0), //技术助理
+                'optimize_manager' => $managerLogic->getCacheName($item['deploy_optimize']['manager_mid'] ?? 0), //优化服务经理
+                'optimize_optimist' => $managerLogic->getCacheName($item['deploy_optimize']['optimist_mid'] ?? 0), //优化师
+                'optimize_assist' => $managerLogic->getCacheName($item['deploy_optimize']['assist_mid'] ?? 0), //优化助理
+                'optimize_tech' => $managerLogic->getCacheName($item['deploy_optimize']['tech_mid'] ?? 0), //售后技术
                 'type' => $item['type'],
                 'type' => $item['type'],
                 'test_domain' => $item['deploy_build']['test_domain'] ?? 0,
                 'test_domain' => $item['deploy_build']['test_domain'] ?? 0,
                 'plan' =>Project::planMap()[$item['deploy_build']['plan']],
                 'plan' =>Project::planMap()[$item['deploy_build']['plan']],