gx

@@ -19,7 +19,7 @@ class BlogLabelController extends BaseController
      */
      */
     public function lists(BlogLabelModel $blogLabelModel){
     public function lists(BlogLabelModel $blogLabelModel){
         $this->map['project_id'] = $this->user['project_id'];
         $this->map['project_id'] = $this->user['project_id'];
-        $lists = $blogLabelModel->lists($this->map,$this->page,$this->row,$this->order);
+        $lists = $blogLabelModel->lists($this->map,$this->page,$this->row,$this->order,['id','name','created_at','updated_at']);
         $this->response('success',Code::SUCCESS,$lists);
         $this->response('success',Code::SUCCESS,$lists);
     }
     }
 
 

@@ -52,6 +52,7 @@ class RoleLogic extends BaseLogic
             ['name'=>$this->param['name']],
             ['name'=>$this->param['name']],
             ['project_id'=>$this->user['project_id']],
             ['project_id'=>$this->user['project_id']],
         ];
         ];
+
         $info = $this->model->read($condition);
         $info = $this->model->read($condition);
         if($info !== false){
         if($info !== false){
             $this->fail('当前添加的角色已存在',Code::USER_PARAMS_ERROE);
             $this->fail('当前添加的角色已存在',Code::USER_PARAMS_ERROE);

@@ -124,41 +124,46 @@ class Base extends Model
                     $query->where($k,$v);
                     $query->where($k,$v);
                     continue;
                     continue;
                 }
                 }
-                switch ($v[0]){
+                foreach ($v as $k1 => $v1){
+                    if(!is_array($v1)){
+                        $query->where($k1,$v1);
+                        continue;
+                    }
+                    switch ($v1[0]){
                         case 'like':
                         case 'like':
                             // like查询 ['name|title'=> ['like','%a%']]
                             // like查询 ['name|title'=> ['like','%a%']]
-                        if (strpos($k, '|') !== false) {
-                            $query->where(function ($query) use ($k,$v) {
-                                $item = explode('|', $k);
+                            if (strpos($k1, '|') !== false) {
+                                $query->where(function ($query) use ($k1,$v1) {
+                                    $item = explode('|', $k1);
                                     foreach ($item as $vo) {
                                     foreach ($item as $vo) {
-                                    $query->orWhere($vo, $v[0], $v[1]);
+                                        $query->orWhere($vo, $v1[0], $v1[1]);
                                     }
                                     }
                                 });
                                 });
                             } else {
                             } else {
-                            $query->where($k, $v[0], $v[1]);
+                                $query->where($k1, $v1[0], $v1[1]);
                             }
                             }
                             break;
                             break;
                         case 'in':
                         case 'in':
                             // in查询 ['id'=>['in',[1,2,3]]]
                             // in查询 ['id'=>['in',[1,2,3]]]
-                        $query->whereIn($k, $v[1]);
+                            $query->whereIn($k1, $v1[1]);
                             break;
                             break;
                         case 'no in':
                         case 'no in':
                             // in查询 ['id'=>['not in',[1,2,3]]]
                             // in查询 ['id'=>['not in',[1,2,3]]]
-                        $query->whereNotIn($k, $v[1]);
+                            $query->whereNotIn($k1, $v1[1]);
                             break;
                             break;
                         case 'between':
                         case 'between':
                             // in查询 ['id'=>['between',[create1,create2]]]
                             // in查询 ['id'=>['between',[create1,create2]]]
-                        $query->whereBetween($k, $v[1]);
+                            $query->whereBetween($k1, $v1[1]);
                         case 'not between':
                         case 'not between':
                             // not between查询 ['created_at'=>['not between',['xxx', 'xxx]]]
                             // not between查询 ['created_at'=>['not between',['xxx', 'xxx]]]
-                        $query->whereNotBetween($k, $v[1]);
+                            $query->whereNotBetween($k1, $v1[1]);
                             break;
                             break;
                         default:
                         default:
-                        $query->where($k,$v[0],$v[1]);
+                            $query->where($k1,$v1[0],$v1[1]);
                             break;
                             break;
                     }
                     }
                 }
                 }
-
+            }
         });
         });
         return $query;
         return $query;
     }
     }