|
@@ -1512,7 +1512,8 @@ class User extends BaseController
|
|
|
$post = UtilService::getMore([
|
|
$post = UtilService::getMore([
|
|
|
['page', 1],
|
|
['page', 1],
|
|
|
['pageSize', 50],
|
|
['pageSize', 50],
|
|
|
- ['time', '']
|
|
|
|
|
|
|
+ ['time', ''],
|
|
|
|
|
+ ['contract_id',0]
|
|
|
], $request);
|
|
], $request);
|
|
|
$post["pageSize"] = $post["pageSize"] > 50 ? 50 : (int)$post["pageSize"];
|
|
$post["pageSize"] = $post["pageSize"] > 50 ? 50 : (int)$post["pageSize"];
|
|
|
$post["page"] = $post["page"] <= 0 ? 1 : (int)$post["page"];
|
|
$post["page"] = $post["page"] <= 0 ? 1 : (int)$post["page"];
|
|
@@ -1533,6 +1534,9 @@ class User extends BaseController
|
|
|
$where[] = ["create_time", "<", $end_time];
|
|
$where[] = ["create_time", "<", $end_time];
|
|
|
// $where[] = ["create_time",'=',strtotime($post['time'])];
|
|
// $where[] = ["create_time",'=',strtotime($post['time'])];
|
|
|
}
|
|
}
|
|
|
|
|
+ if ($post['contract_id']>0){
|
|
|
|
|
+ $where[] = ["contract_id",$post['contract_id']];
|
|
|
|
|
+ }
|
|
|
$totalCount = (new UserClockModel())->where($where)->count();
|
|
$totalCount = (new UserClockModel())->where($where)->count();
|
|
|
|
|
|
|
|
$data = null;
|
|
$data = null;
|