yin5th
/
building-sign
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix(接口): 用户打卡记录修改逻辑

master
yin5th 2023-01-15 11:17:38 +08:00
parent c70ae0ab83
commit 1ae1cbc429
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/controller/api/v1/User.php
View File

@ -377,15 +377,11 @@ class User extends Base
} }
$where = []; $where = [];
// $where[] = ['cl.created_at', '>', date($day.' 00:00:00')];
// $where[] = ['cl.created_at', '<', date($day.' 23:59:59')];
$dayInt = str_replace('-', '', $day); $dayInt = str_replace('-', '', $day);
$where[] = ['cl.day', '=', $dayInt]; $where[] = ['cl.day', '=', $dayInt];
$where[] = ['cl.account_id', '=', $accountId]; $where[] = ['cl.account_id', '=', $accountId];
if ($worksiteId) { $where[] = ['cl.worksite_id', '=', $worksiteId ?: $account['worksite_id']];
$where[] = ['cl.worksite_id', '=', $worksiteId];
}
$where[] = ['cl.role', '=', $account['role']]; $where[] = ['cl.role', '=', $account['role']];
$limit = $account['role'] == Account::ROLE_NORMAL ? 4 : 0;//普通用户只展示最新4条 其他不限制 $limit = $account['role'] == Account::ROLE_NORMAL ? 4 : 0;//普通用户只展示最新4条 其他不限制
@ -505,7 +501,7 @@ class User extends Base
$where[] = ['cl.day', 'like', $ym.'%']; $where[] = ['cl.day', 'like', $ym.'%'];
$where[] = ['cl.account_id', '=', $accountId]; $where[] = ['cl.account_id', '=', $accountId];
$where[] = ['cl.role', '=', $account['role']]; $where[] = ['cl.role', '=', $account['role']];
$where[] = ['cl.worksite_id', '=', $worksiteId]; $where[] = ['cl.worksite_id', '=', $worksiteId ?: $accountId['worksite_id']];
$list = \app\model\ClockLog::alias('cl') $list = \app\model\ClockLog::alias('cl')
->where($where) ->where($where)
->select(); ->select();