周海龙 / globalso · 提交

转到一个项目

作者 李宇航
提交 fb4b1042f317538146cce3649a5374e6746708d4 2 个父辈 aba211a6 ac8f6411

合并分支 'lyh-server' 到 'master' 

gxAiblog自动发布



查看合并请求 !2011
内嵌 并排对比
正在显示 1 个修改的文件 包含 2 行增加 和 0 行删除
@@ -38,6 +38,7 @@ class CheckListController extends BaseController @@ -38,6 +38,7 @@ class CheckListController extends BaseController
38 */ 38 */
39 public function lists(){ 39 public function lists(){
40 $this->map['status'] = 1; 40 $this->map['status'] = 1;
  41 + $this->map['type'] = $this->map['type'] ?? 1;
41 $field = ['id','status','sort','text','created_at']; 42 $field = ['id','status','sort','text','created_at'];
42 $data = $this->model->lists($this->map,$this->page,$this->row,'id',$field); 43 $data = $this->model->lists($this->map,$this->page,$this->row,'id',$field);
43 $this->response('success',Code::SUCCESS,$data); 44 $this->response('success',Code::SUCCESS,$data);
@@ -52,6 +53,7 @@ class CheckListController extends BaseController @@ -52,6 +53,7 @@ class CheckListController extends BaseController
52 */ 53 */
53 public function list(){ 54 public function list(){
54 $this->map['status'] = 1; 55 $this->map['status'] = 1;
  56 + $this->map['type'] = $this->map['type'] ?? 1;
55 $field = ['id','status','sort','text','created_at']; 57 $field = ['id','status','sort','text','created_at'];
56 $data = $this->model->list($this->map,'id',$field); 58 $data = $this->model->list($this->map,'id',$field);
57 $this->response('success',Code::SUCCESS,$data); 59 $this->response('success',Code::SUCCESS,$data);