作者 lyh

gx

@@ -25,6 +25,9 @@ class KeywordPrefixController extends BaseController @@ -25,6 +25,9 @@ class KeywordPrefixController extends BaseController
25 */ 25 */
26 public function getKeywordPrefix(){ 26 public function getKeywordPrefix(){
27 $keywordPrefixModel = new KeywordPrefix(); 27 $keywordPrefixModel = new KeywordPrefix();
  28 + if(isset($this->map['project_id']) && !empty($this->map['project_id'])){
  29 + $this->map['project_id'] = ['in',[0,$this->map['project_id']];
  30 + }
28 $list = $keywordPrefixModel->list($this->map); 31 $list = $keywordPrefixModel->list($this->map);
29 $this->response('success',Code::SUCCESS,$list); 32 $this->response('success',Code::SUCCESS,$list);
30 } 33 }
@@ -24,7 +24,7 @@ class NewsController extends BaseController @@ -24,7 +24,7 @@ class NewsController extends BaseController
24 * @method 24 * @method
25 */ 25 */
26 public function lists(NewsModel $news){ 26 public function lists(NewsModel $news){
27 - $filed = ['id','category_id','operator_id','status','created_at','image','updated_at','name','sort','url', 'release_at','is_upgrade']; 27 + $filed = ['id','category_id','operator_id','status','created_at','image','updated_at','name','sort','url', 'release_at','is_upgrade','seo_mate'];
28 $this->order = 'sort'; 28 $this->order = 'sort';
29 $query = $news->orderBy($this->order ,'desc')->orderBy('id','desc'); 29 $query = $news->orderBy($this->order ,'desc')->orderBy('id','desc');
30 $query = $this->searchParam($query); 30 $query = $this->searchParam($query);
@@ -36,6 +36,7 @@ class NewsController extends BaseController @@ -36,6 +36,7 @@ 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'] =
39 $v['url'] = $this->user['domain'].getRouteMap(RouteMap::SOURCE_NEWS,$v['id']); 40 $v['url'] = $this->user['domain'].getRouteMap(RouteMap::SOURCE_NEWS,$v['id']);
40 $v['image_link'] = getImageUrl($v['image']); 41 $v['image_link'] = getImageUrl($v['image']);
41 $v['operator_name'] = $user->getName($v['operator_id']); 42 $v['operator_name'] = $user->getName($v['operator_id']);