周海龙 / globalso · 提交

转到一个项目

作者 lyh
提交 7ca0ccbe3bd3e0be20462bf126d4db9ce4b73ae6 1 个父辈 3ae7dcee

gx

内嵌 并排对比
正在显示 2 个修改的文件 包含 2 行增加 和 6 行删除
@@ -20,9 +20,7 @@ class BlogCategoryController extends BaseController @@ -20,9 +20,7 @@ class BlogCategoryController extends BaseController
20 public function lists(BlogCategoryModel $blogCategoryModel){ 20 public function lists(BlogCategoryModel $blogCategoryModel){
21 //搜索条件 21 //搜索条件
22 $this->map['project_id'] = $this->user['project_id']; 22 $this->map['project_id'] = $this->user['project_id'];
23 - if(!isset($this->map['pid']) && empty($this->map['pid'])){  
24 - $this->map['pid'] = 0;  
25 - } 23 + $this->map['pid'] = $this->param['pid'];
26 $lists = $blogCategoryModel->lists($this->map,$this->page,$this->row,$this->order, 24 $lists = $blogCategoryModel->lists($this->map,$this->page,$this->row,$this->order,
27 ['id','pid','name','num','alias','status','sort','remark','created_at','updated_at']); 25 ['id','pid','name','num','alias','status','sort','remark','created_at','updated_at']);
28 if(!empty($lists['list'])){ 26 if(!empty($lists['list'])){
@@ -20,9 +20,7 @@ class NewsCategoryController extends BaseController @@ -20,9 +20,7 @@ class NewsCategoryController extends BaseController
20 public function lists(NewsCategoryModel $newsCategory){ 20 public function lists(NewsCategoryModel $newsCategory){
21 //搜索条件 21 //搜索条件
22 $this->map['project_id'] = $this->user['project_id']; 22 $this->map['project_id'] = $this->user['project_id'];
23 - if(!isset($this->map['pid']) && empty($this->map['pid'])){  
24 - $this->map['pid'] = 0;  
25 - } 23 + $this->map['pid'] = $this->param['pid'];
26 $lists = $newsCategory->lists($this->map,$this->page,$this->row,$this->order, 24 $lists = $newsCategory->lists($this->map,$this->page,$this->row,$this->order,
27 ['id','pid','name','num','alias','status','sort','remark','created_at','updated_at']); 25 ['id','pid','name','num','alias','status','sort','remark','created_at','updated_at']);
28 if(!empty($lists['list'])){ 26 if(!empty($lists['list'])){