作者 lyh

gx

@@ -36,7 +36,6 @@ class NewsController extends BaseController @@ -36,7 +36,6 @@ class NewsController extends BaseController
36 $user = new User(); 36 $user = new User();
37 foreach ($lists['list'] as $k => $v){ 37 foreach ($lists['list'] as $k => $v){
38 $v['category_name'] = $this->categoryName($v['category_id'],$data); 38 $v['category_name'] = $this->categoryName($v['category_id'],$data);
39 - $v['seo_mate'] =  
40 $v['url'] = $this->user['domain'].getRouteMap(RouteMap::SOURCE_NEWS,$v['id']); 39 $v['url'] = $this->user['domain'].getRouteMap(RouteMap::SOURCE_NEWS,$v['id']);
41 $v['image_link'] = getImageUrl($v['image']); 40 $v['image_link'] = getImageUrl($v['image']);
42 $v['operator_name'] = $user->getName($v['operator_id']); 41 $v['operator_name'] = $user->getName($v['operator_id']);
@@ -35,7 +35,7 @@ class OnlineCheckLogic extends BaseLogic @@ -35,7 +35,7 @@ class OnlineCheckLogic extends BaseLogic
35 $optimizeInfo = $optimizeModel->read(['project_id'=>$this->param['id']]); 35 $optimizeInfo = $optimizeModel->read(['project_id'=>$this->param['id']]);
36 //查看当前用户是否有权限审核 36 //查看当前用户是否有权限审核
37 if($this->param['type'] == 'optimist'){ 37 if($this->param['type'] == 'optimist'){
38 - if(($info['optimist_mid'] != $this->manager['id']) && ($optimizeInfo['assist_mid'] != $this->manager['id'])){ 38 + if(($optimizeInfo['optimist_mid'] != $this->manager['id']) && ($optimizeInfo['assist_mid'] != $this->manager['id'])){
39 $this->fail('你无权限提交审核'); 39 $this->fail('你无权限提交审核');
40 } 40 }
41 }else{ 41 }else{
@@ -43,7 +43,7 @@ class OnlineCheckLogic extends BaseLogic @@ -43,7 +43,7 @@ class OnlineCheckLogic extends BaseLogic
43 if($info['optimist_status'] != 1){ 43 if($info['optimist_status'] != 1){
44 $this->fail('请先优化师审核'); 44 $this->fail('请先优化师审核');
45 } 45 }
46 - if($info['qa_mid'] != 0 && $info['qa_mid'] != $this->manager['id']){ 46 + if(($info['qa_mid'] != 0) && ($info['qa_mid'] != $this->manager['id'])){
47 $this->fail('你无权限提交审核'); 47 $this->fail('你无权限提交审核');
48 } 48 }
49 if(isset($this->param['project_type']) && !empty($this->param['project_type'])){ 49 if(isset($this->param['project_type']) && !empty($this->param['project_type'])){
@@ -73,7 +73,7 @@ class OnlineCheckLogic extends BaseLogic @@ -73,7 +73,7 @@ class OnlineCheckLogic extends BaseLogic
73 $this->fail('已提交,请勿重复提交'); 73 $this->fail('已提交,请勿重复提交');
74 }else{ 74 }else{
75 if(($this->param['optimist_mid'] == 0) || ($this->param['qa_mid'] == 0)){ 75 if(($this->param['optimist_mid'] == 0) || ($this->param['qa_mid'] == 0)){
76 - $this->fail('请先选择优化师和品控'); 76 + $this->fail('请先选择优化师和品控,在提交审核');
77 } 77 }
78 //组装数据 78 //组装数据
79 $data = [ 79 $data = [