gx

@@ -24,7 +24,8 @@ class Base extends Model
      */
      */
     public function lists($map, $p, $row, $order = 'id', $fields = ['*']){
     public function lists($map, $p, $row, $order = 'id', $fields = ['*']){
         //TODO::where(['id'=>'','name'=>''])
         //TODO::where(['id'=>'','name'=>''])
-        $lists = $this->select($fields)->where($map)->orderBy($order)->paginate($row, ['*'], 'page', $p);
+        $query = $this->formatQuery($map);
+        $lists = $query->select($fields)->orderBy($order)->paginate($row, ['*'], 'page', $p);
         if (empty($lists)) {
         if (empty($lists)) {
             return false;
             return false;
         }
         }
@@ -43,7 +44,8 @@ class Base extends Model
      * @method
      * @method
      */
      */
     public function list($map,$order = 'id',$fields = ['*']){
     public function list($map,$order = 'id',$fields = ['*']){
-        $lists = $this->select($fields)->where($map)->orderBy($order)->get();
+        $query = $this->formatQuery($map);
+        $lists = $query->select($fields)->orderBy($order)->get();
         if (empty($lists)) {
         if (empty($lists)) {
             return false;
             return false;
         }
         }
@@ -88,8 +90,10 @@ class Base extends Model
      * @method post
      * @method post
      */
      */
     public function edit($data,$condition){
     public function edit($data,$condition){
+        $query = $this->formatQuery($condition);
         $data['updated_at'] = date('Y-m-d H:i:s');
         $data['updated_at'] = date('Y-m-d H:i:s');
-        return $this->where($condition)->update($data);
+        $rs = $query->update($data);
+        return $rs;
     }
     }
 
 
     /**
     /**
@@ -99,19 +103,20 @@ class Base extends Model
      * @method
      * @method
      */
      */
     public function del($condition){
     public function del($condition){
-        return $this->where($condition)->delete();
+        $query = $this->formatQuery($condition);
+        return $query->delete();
     }
     }
 
 
 
 
     /**
     /**
      * @param $map = ['$k'=>['like',$v],$k1]
      * @param $map = ['$k'=>['like',$v],$k1]
      * @param $val
      * @param $val
-     * @name
+     * @name :参数处理查询
      * @return Base
      * @return Base
      * @author :liyuhang
      * @author :liyuhang
      * @method
      * @method
      */
      */
-    public function formatQuery($map = []){
+    public function formatQuery($map = [],$query = ''){
         $query = $this;
         $query = $this;
         $query->where(function ($query) use ($map){
         $query->where(function ($query) use ($map){
             foreach ($map as $k => $v){
             foreach ($map as $k => $v){