|
@@ -51,7 +51,7 @@ class Unit extends BaseController
|
|
$size = isset($this->post['size']) && $this->post['size'] !=="" ? intval($this->post['size']):"10";
|
|
$size = isset($this->post['size']) && $this->post['size'] !=="" ? intval($this->post['size']):"10";
|
|
$where=[["is_del","=",0]];
|
|
$where=[["is_del","=",0]];
|
|
$unit = isset($this->post['unit']) && $this->post['unit'] !=="" ? trim($this->post['unit']):"";
|
|
$unit = isset($this->post['unit']) && $this->post['unit'] !=="" ? trim($this->post['unit']):"";
|
|
- if($unit!=""){
|
|
|
|
|
|
+ if($unit!==""){
|
|
$where[]=['unit',"like","%$unit%"];
|
|
$where[]=['unit',"like","%$unit%"];
|
|
}
|
|
}
|
|
$status = isset($this->post['status']) && $this->post['status'] !=="" ? intval($this->post['status'])
|
|
$status = isset($this->post['status']) && $this->post['status'] !=="" ? intval($this->post['status'])
|
|
@@ -59,17 +59,19 @@ class Unit extends BaseController
|
|
if($status!==""){
|
|
if($status!==""){
|
|
$where[]=['status',"=",$status];
|
|
$where[]=['status',"=",$status];
|
|
}
|
|
}
|
|
- $creater = isset($this->post['creater']) && $this->post['creater'] !=="" ? intval($this->post['creater']):"";
|
|
|
|
|
|
+ $creater = isset($this->post['creater']) && $this->post['creater'] !=="" ? trim($this->post['creater']):"";
|
|
if($creater!=""){
|
|
if($creater!=""){
|
|
$where[]=['creater',"like","%$creater%"];
|
|
$where[]=['creater',"like","%$creater%"];
|
|
}
|
|
}
|
|
$start = isset($this->post['start']) && $this->post['start']!=="" ? $this->post['start']:"";
|
|
$start = isset($this->post['start']) && $this->post['start']!=="" ? $this->post['start']:"";
|
|
if($start!==""){
|
|
if($start!==""){
|
|
- $where[]=['addtime',">=",date('Y-m-d H:i:s',strtotime($start))];
|
|
|
|
|
|
+ // $where[]=['addtime',">=",date('Y-m-d H:i:s')];//,strtotime($start)
|
|
|
|
+ $where[]=['addtime',">=",$start];
|
|
}
|
|
}
|
|
$end = isset($this->post['end']) && $this->post['end']!=="" ? $this->post['end']:"";
|
|
$end = isset($this->post['end']) && $this->post['end']!=="" ? $this->post['end']:"";
|
|
if($end!==""){
|
|
if($end!==""){
|
|
- $where[]=['addtime',"<",date('Y-m-d H:i:s',strtotime($end)+24*3600)];
|
|
|
|
|
|
+ // $where[]=['addtime',"<",date('Y-m-d H:i:s')];//,strtotime($end)+24*3600
|
|
|
|
+ $where[]=['addtime',"<=",$end];
|
|
}
|
|
}
|
|
$count = Db::name('unit') ->where($where)->count();
|
|
$count = Db::name('unit') ->where($where)->count();
|
|
$total = ceil($count / $size);
|
|
$total = ceil($count / $size);
|