Merge remote-tracking branch 'origin/master' into akun

@@ -258,11 +258,15 @@ class ProjectController extends BaseController
      */
     public function searchDept(&$query){
         if(!empty($this->map['dept_id'])){
+            if($this->map['dept_id'] == 7 || $this->map['dept_id'] == 9){//7,9代表合并组H+F组
+                $query->whereIn('gl_project_deploy_build.dept_id', [7,9]);
+            }else{
                 $query->where(function ($subQuery) {
                     $subQuery->orwhere('gl_project_deploy_build.dept_id',$this->map['dept_id'])
                         ->orwhere('gl_project_deploy_optimize.dept_id',$this->map['dept_id']);
                 });
             }
+        }
         return $query;
     }
 
@@ -310,7 +314,7 @@ class ProjectController extends BaseController
             $info = $managerHr->read(['manage_id'=>$this->manage['id']]);
             //获取当前用户自己的项目
             $query->where(function ($subQuery) use ($info) {
-                $subQuery->whereIn('gl_project.id',[1])//项目1+项目3默认显示
+                $subQuery->whereIn('gl_project.id', [1]) // 项目1 + 项目3默认显示
                 ->orWhere('gl_project_deploy_build.leader_mid', $info['id'])
                     ->orWhere('gl_project_deploy_build.manager_mid', $info['id'])
                     ->orWhere('gl_project_deploy_build.designer_mid', $info['id'])
@@ -321,9 +325,18 @@ class ProjectController extends BaseController
                     ->orWhere('gl_project_deploy_optimize.tech_mid', $info['id'])
                     ->orWhere('gl_project_deploy_optimize.tech_leader', $info['id'])
                     ->orWhere('gl_project_deploy_optimize.quality_mid', $info['id'])
-                    ->orWhere('gl_project_deploy_optimize.design_mid', $info['id'])
-                    ->orWhere('gl_project_deploy_build.dept_id', $info['belong_group'])
+                    ->orWhere('gl_project_deploy_optimize.design_mid', $info['id']);
+                // 处理 dept_id 条件
+                if (in_array($info['belong_group'], [7, 9])) {
+                    // 7, 9 代表合并组 H + F 组
+                    $subQuery->orWhere(function ($innerQuery) {
+                        $innerQuery->where('gl_project_deploy_build.dept_id', 7)
+                            ->orWhere('gl_project_deploy_build.dept_id', 9);
+                    });
+                } else {
+                    $subQuery->orWhere('gl_project_deploy_build.dept_id', $info['belong_group'])
                         ->orWhere('gl_project_deploy_optimize.dept_id', $info['belong_group']);
+                }
             });
         }
         return $query;

@@ -79,10 +79,10 @@ class ExtensionModuleController extends BaseController
             if($info !== false){
                 $v['is_use'] = 1;
             }
-            $list[$k] = $v;
             if(!empty($v['data'])){
                 $v['data'] = json_decode($v['data'],true);
             }
+            $list[$k] = $v;
         }
         $this->response('success',Code::SUCCESS,$list);
     }

@@ -102,6 +102,7 @@ class ProjectLogic extends BaseLogic
         $info['minor_languages'] = $this->getProjectMinorLanguages($id);
         //升级项目采集完成时间
         $info['collect_time'] = $info['is_upgrade'] ? UpdateLog::getProjectUpdate($id) : '';
+
         return $this->success($info);
     }
 
@@ -785,7 +786,9 @@ class ProjectLogic extends BaseLogic
     public function saveOtherProject(){
         //获取当前数据详情
         $projectInfo = $this->getProjectInfo($this->param['id']);
-        //aicc if (($projectInfo['aicc'] == Project::TYPE_ZERO) && ($this->param['aicc'] == Project::TYPE_ONE)) 从关闭到开启状态才同步， 改成只要是开启状态就同步
+        if(($projectInfo['created_at'] >= '2014-12-01 00:00:00')){//12月1号过后默认不开启
+            $this->param['aicc'] = Project::TYPE_ZERO;
+        }
         if($this->param['aicc'] == Project::TYPE_ONE && !empty($this->param['exclusive_aicc_day'])){
             $data = [
                 'company_name'=>$projectInfo['company'],