gx

@@ -42,55 +42,67 @@ class BaseController extends Controller
             $this->user = $info;
             $this->uid = $info['id'];
             //参数处理
-            $this->get_param();
+            $this->getParam();
             //日志记录
             $this->set_user_log();
         }
     }
+
     /**
-     * @name :参数过滤
-     * @author :liyuhang
-     * @method
+     * @remark :请求参数处理
+     * @name   :getParam
+     * @author :lyh
+     * @method :post
+     * @time   :2023/6/17 16:34
      */
-    public function get_param(){
-        $param = $this->param;
-        foreach ($param as $k => $v){
+    public function getParam(){
+        foreach ($this->param as $k => $v){
             if(is_array($v)){
                 continue;
+            }else{
+                if(empty($v) && ($v == null)){
+                    unset($this->param[$k]);
+                }
+                $this->getMap($k,$v);
             }
-            switch ($k){
-                case "order":
-                    $this->order = $v;
-                    break;
-                case 'page':
-                    $this->page = $v;
-                    break;
-                case 'row':
-                    $this->row = $v;
-                    break;
-                case "status":
-                    $this->map['status'] = $v;
-                    break;
-                case "name":
-                    $this->map['name'] = ['like','%'.$v.'%'];
-                    break;
-                case "start_at":
-                    if(!empty($v)){
-                        $this->_btw[0]                             = $v;
-                        $this->_btw[1]                             = date('Y-m-d H:i:s',time());
-                        $this->map['created_at'] = ['between', $this->_btw];
-                    }
-                    break;
-                case "end_at":
-                    if(!empty($v)){
-                        $this->_btw[1]                             = $v;
-                        $this->map['created_at'] = ['between', $this->_btw];
-                    }
-                    break;
-                default:
+        }
+    }
+
+    /**
+     * @remark :搜索参数处理
+     * @name   :getMap
+     * @author :lyh
+     * @method :post
+     * @time   :2023/8/28 10:22
+     */
+    public function getMap($k,$v){
+        switch ($k){
+            case "order":
+                $this->order = $v;
+                break;
+            case 'page':
+                $this->page = $v;
+                break;
+            case 'row':
+                $this->row = $v;
+                break;
+            case "name":
+                $this->map['name'] = ['like','%'.$v.'%'];
+                break;
+            case "start_at":
+                $this->_btw[0]                             = $v;
+                $this->_btw[1]                             = date('Y-m-d H:i:s',time());
+                $this->map['created_at'] = ['between', $this->_btw];
+                break;
+            case "end_at":
+                $this->_btw[1]                             = $v;
+                $this->map['updated_at'] = ['between', $this->_btw];
+                break;
+            default:
+                if (!empty($v) || $v == 0) {
                     $this->map[$k] = $v;
-                    break;
-            }
+                }
+                break;
         }
     }
 

@@ -30,9 +30,6 @@ class DeptLogic extends  BaseLogic
      */
     public function deptSave(){
         if(isset($this->param['id']) && !empty($this->param['id'])){
-            if($this->param['pid'] == $this->param['id']){
-                $this->fail('当前上级分类不能为自己');
-            }
             $this->model->edit($this->param,['id'=>$this->param]);
         }else{
             $this->model->add($this->param);