作者 lyh

gx

@@ -42,22 +42,40 @@ class BaseController extends Controller @@ -42,22 +42,40 @@ class BaseController extends Controller
42 $this->user = $info; 42 $this->user = $info;
43 $this->uid = $info['id']; 43 $this->uid = $info['id'];
44 //参数处理 44 //参数处理
45 - $this->get_param(); 45 + $this->getParam();
46 //日志记录 46 //日志记录
47 $this->set_user_log(); 47 $this->set_user_log();
48 } 48 }
49 } 49 }
  50 +
50 /** 51 /**
51 - * @name :参数过滤  
52 - * @author :liyuhang  
53 - * @method 52 + * @remark :请求参数处理
  53 + * @name :getParam
  54 + * @author :lyh
  55 + * @method :post
  56 + * @time :2023/6/17 16:34
54 */ 57 */
55 - public function get_param(){  
56 - $param = $this->param;  
57 - foreach ($param as $k => $v){ 58 + public function getParam(){
  59 + foreach ($this->param as $k => $v){
58 if(is_array($v)){ 60 if(is_array($v)){
59 continue; 61 continue;
  62 + }else{
  63 + if(empty($v) && ($v == null)){
  64 + unset($this->param[$k]);
  65 + }
  66 + $this->getMap($k,$v);
60 } 67 }
  68 + }
  69 + }
  70 +
  71 + /**
  72 + * @remark :搜索参数处理
  73 + * @name :getMap
  74 + * @author :lyh
  75 + * @method :post
  76 + * @time :2023/8/28 10:22
  77 + */
  78 + public function getMap($k,$v){
61 switch ($k){ 79 switch ($k){
62 case "order": 80 case "order":
63 $this->order = $v; 81 $this->order = $v;
@@ -68,29 +86,23 @@ class BaseController extends Controller @@ -68,29 +86,23 @@ class BaseController extends Controller
68 case 'row': 86 case 'row':
69 $this->row = $v; 87 $this->row = $v;
70 break; 88 break;
71 - case "status":  
72 - $this->map['status'] = $v;  
73 - break;  
74 case "name": 89 case "name":
75 $this->map['name'] = ['like','%'.$v.'%']; 90 $this->map['name'] = ['like','%'.$v.'%'];
76 break; 91 break;
77 case "start_at": 92 case "start_at":
78 - if(!empty($v)){  
79 $this->_btw[0] = $v; 93 $this->_btw[0] = $v;
80 $this->_btw[1] = date('Y-m-d H:i:s',time()); 94 $this->_btw[1] = date('Y-m-d H:i:s',time());
81 $this->map['created_at'] = ['between', $this->_btw]; 95 $this->map['created_at'] = ['between', $this->_btw];
82 - }  
83 break; 96 break;
84 case "end_at": 97 case "end_at":
85 - if(!empty($v)){  
86 $this->_btw[1] = $v; 98 $this->_btw[1] = $v;
87 - $this->map['created_at'] = ['between', $this->_btw];  
88 - } 99 + $this->map['updated_at'] = ['between', $this->_btw];
89 break; 100 break;
90 default: 101 default:
  102 + if (!empty($v) || $v == 0) {
91 $this->map[$k] = $v; 103 $this->map[$k] = $v;
92 - break;  
93 } 104 }
  105 + break;
94 } 106 }
95 } 107 }
96 108
@@ -30,9 +30,6 @@ class DeptLogic extends BaseLogic @@ -30,9 +30,6 @@ class DeptLogic extends BaseLogic
30 */ 30 */
31 public function deptSave(){ 31 public function deptSave(){
32 if(isset($this->param['id']) && !empty($this->param['id'])){ 32 if(isset($this->param['id']) && !empty($this->param['id'])){
33 - if($this->param['pid'] == $this->param['id']){  
34 - $this->fail('当前上级分类不能为自己');  
35 - }  
36 $this->model->edit($this->param,['id'=>$this->param]); 33 $this->model->edit($this->param,['id'=>$this->param]);
37 }else{ 34 }else{
38 $this->model->add($this->param); 35 $this->model->add($this->param);