周海龙 / globalso · 提交

转到一个项目

作者 刘锟
提交 235edf677cd13dfb7d1a2c4f5e33600eb257639b 2 个父辈 fc46cbb7 b92aa100

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

内嵌 并排对比
正在显示 3 个修改的文件 包含 27 行增加 和 11 行删除
@@ -258,10 +258,14 @@ class ProjectController extends BaseController @@ -258,10 +258,14 @@ class ProjectController extends BaseController
258 */ 258 */
259 public function searchDept(&$query){ 259 public function searchDept(&$query){
260 if(!empty($this->map['dept_id'])){ 260 if(!empty($this->map['dept_id'])){
261 - $query->where(function ($subQuery) {  
262 - $subQuery->orwhere('gl_project_deploy_build.dept_id',$this->map['dept_id'])  
263 - ->orwhere('gl_project_deploy_optimize.dept_id',$this->map['dept_id']);  
264 - }); 261 + if($this->map['dept_id'] == 7 || $this->map['dept_id'] == 9){//7,9代表合并组H+F组
  262 + $query->whereIn('gl_project_deploy_build.dept_id', [7,9]);
  263 + }else{
  264 + $query->where(function ($subQuery) {
  265 + $subQuery->orwhere('gl_project_deploy_build.dept_id',$this->map['dept_id'])
  266 + ->orwhere('gl_project_deploy_optimize.dept_id',$this->map['dept_id']);
  267 + });
  268 + }
265 } 269 }
266 return $query; 270 return $query;
267 } 271 }
@@ -310,8 +314,8 @@ class ProjectController extends BaseController @@ -310,8 +314,8 @@ class ProjectController extends BaseController
310 $info = $managerHr->read(['manage_id'=>$this->manage['id']]); 314 $info = $managerHr->read(['manage_id'=>$this->manage['id']]);
311 //获取当前用户自己的项目 315 //获取当前用户自己的项目
312 $query->where(function ($subQuery) use ($info) { 316 $query->where(function ($subQuery) use ($info) {
313 - $subQuery->whereIn('gl_project.id',[1])//项目1+项目3默认显示  
314 - ->orWhere('gl_project_deploy_build.leader_mid', $info['id']) 317 + $subQuery->whereIn('gl_project.id', [1]) // 项目1 + 项目3默认显示
  318 + ->orWhere('gl_project_deploy_build.leader_mid', $info['id'])
315 ->orWhere('gl_project_deploy_build.manager_mid', $info['id']) 319 ->orWhere('gl_project_deploy_build.manager_mid', $info['id'])
316 ->orWhere('gl_project_deploy_build.designer_mid', $info['id']) 320 ->orWhere('gl_project_deploy_build.designer_mid', $info['id'])
317 ->orWhere('gl_project_deploy_build.tech_mid', $info['id']) 321 ->orWhere('gl_project_deploy_build.tech_mid', $info['id'])
@@ -321,9 +325,18 @@ class ProjectController extends BaseController @@ -321,9 +325,18 @@ class ProjectController extends BaseController
321 ->orWhere('gl_project_deploy_optimize.tech_mid', $info['id']) 325 ->orWhere('gl_project_deploy_optimize.tech_mid', $info['id'])
322 ->orWhere('gl_project_deploy_optimize.tech_leader', $info['id']) 326 ->orWhere('gl_project_deploy_optimize.tech_leader', $info['id'])
323 ->orWhere('gl_project_deploy_optimize.quality_mid', $info['id']) 327 ->orWhere('gl_project_deploy_optimize.quality_mid', $info['id'])
324 - ->orWhere('gl_project_deploy_optimize.design_mid', $info['id'])  
325 - ->orWhere('gl_project_deploy_build.dept_id', $info['belong_group'])  
326 - ->orWhere('gl_project_deploy_optimize.dept_id', $info['belong_group']); 328 + ->orWhere('gl_project_deploy_optimize.design_mid', $info['id']);
  329 + // 处理 dept_id 条件
  330 + if (in_array($info['belong_group'], [7, 9])) {
  331 + // 7, 9 代表合并组 H + F 组
  332 + $subQuery->orWhere(function ($innerQuery) {
  333 + $innerQuery->where('gl_project_deploy_build.dept_id', 7)
  334 + ->orWhere('gl_project_deploy_build.dept_id', 9);
  335 + });
  336 + } else {
  337 + $subQuery->orWhere('gl_project_deploy_build.dept_id', $info['belong_group'])
  338 + ->orWhere('gl_project_deploy_optimize.dept_id', $info['belong_group']);
  339 + }
327 }); 340 });
328 } 341 }
329 return $query; 342 return $query;
@@ -79,10 +79,10 @@ class ExtensionModuleController extends BaseController @@ -79,10 +79,10 @@ class ExtensionModuleController extends BaseController
79 if($info !== false){ 79 if($info !== false){
80 $v['is_use'] = 1; 80 $v['is_use'] = 1;
81 } 81 }
82 - $list[$k] = $v;  
83 if(!empty($v['data'])){ 82 if(!empty($v['data'])){
84 $v['data'] = json_decode($v['data'],true); 83 $v['data'] = json_decode($v['data'],true);
85 } 84 }
  85 + $list[$k] = $v;
86 } 86 }
87 $this->response('success',Code::SUCCESS,$list); 87 $this->response('success',Code::SUCCESS,$list);
88 } 88 }
@@ -102,6 +102,7 @@ class ProjectLogic extends BaseLogic @@ -102,6 +102,7 @@ class ProjectLogic extends BaseLogic
102 $info['minor_languages'] = $this->getProjectMinorLanguages($id); 102 $info['minor_languages'] = $this->getProjectMinorLanguages($id);
103 //升级项目采集完成时间 103 //升级项目采集完成时间
104 $info['collect_time'] = $info['is_upgrade'] ? UpdateLog::getProjectUpdate($id) : ''; 104 $info['collect_time'] = $info['is_upgrade'] ? UpdateLog::getProjectUpdate($id) : '';
  105 +
105 return $this->success($info); 106 return $this->success($info);
106 } 107 }
107 108
@@ -785,7 +786,9 @@ class ProjectLogic extends BaseLogic @@ -785,7 +786,9 @@ class ProjectLogic extends BaseLogic
785 public function saveOtherProject(){ 786 public function saveOtherProject(){
786 //获取当前数据详情 787 //获取当前数据详情
787 $projectInfo = $this->getProjectInfo($this->param['id']); 788 $projectInfo = $this->getProjectInfo($this->param['id']);
788 - //aicc if (($projectInfo['aicc'] == Project::TYPE_ZERO) && ($this->param['aicc'] == Project::TYPE_ONE)) 从关闭到开启状态才同步， 改成只要是开启状态就同步 789 + if(($projectInfo['created_at'] >= '2014-12-01 00:00:00')){//12月1号过后默认不开启
  790 + $this->param['aicc'] = Project::TYPE_ZERO;
  791 + }
789 if($this->param['aicc'] == Project::TYPE_ONE && !empty($this->param['exclusive_aicc_day'])){ 792 if($this->param['aicc'] == Project::TYPE_ONE && !empty($this->param['exclusive_aicc_day'])){
790 $data = [ 793 $data = [
791 'company_name'=>$projectInfo['company'], 794 'company_name'=>$projectInfo['company'],