mkm/TaskSystem
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request '更新' (#30) from mkm into master

Browse Source 
Reviewed-on: http://git.excellentkk.cn/mkm/TaskSystem/pulls/30
This commit is contained in:
mkm 2023-08-04 14:49:05 +08:00
commit 4933121bd1
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/api/lists/AccountLogLists.php
View File

@ -114,11 +114,13 @@ class AccountLogLists extends BaseApiDataLists
$startTime = $date - 3600; // 获取该日期零点的时间戳 $startTime = $date - 3600; // 获取该日期零点的时间戳
$endTime = $date + 86400; // 获取该日期24小时后的时间戳 $endTime = $date + 86400; // 获取该日期24小时后的时间戳
$where[] = ['create_time', 'between time', [$startTime, $endTime]]; $where[] = ['create_time', 'between time', [$startTime, $endTime]];
}else{
$where[] = ['create_time', 'between time', [strtotime(date('Y-m-d')), strtotime(date('Y-m-d'))+86400]];
} }
$lists = UserAccountLog::field($field) $lists = UserAccountLog::field($field)
->where($where) ->where($where)
->with(['userInfo']) ->with(['userInfo'])
->whereDay('create_time') // ->whereDay('create_time')
->order('id', 'desc') ->order('id', 'desc')
->limit($this->limitOffset, $this->limitLength) ->limit($this->limitOffset, $this->limitLength)
->select() ->select()