Scarfski/dootask
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

perf: 优化修改员工mac地址备注

Browse Source
This commit is contained in:
kuaifan
2023-01-30 17:46:02 +08:00
parent b2cbba08f2
commit b7686df7e6
3 changed files with 68 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
app/Http/Controllers/Api/UsersController.php
View File

@@ -606,7 +606,7 @@ class UsersController extends AbstractController
//
if ($getCheckinMac) {
$list->transform(function (User $user) {
$user->checkin_macs = UserCheckinMac::whereUserid($user->userid)->orderBy('id')->pluck('mac');
$user->checkin_macs = UserCheckinMac::select(['id', 'mac', 'remark'])->whereUserid($user->userid)->orderBy('id')->get();
return $user;
});
}
@@ -673,13 +673,14 @@ class UsersController extends AbstractController
break;
case 'checkin_macs':
$list = explode(",", $data['checkin_macs']);
$list = is_array($data['checkin_macs']) ? $data['checkin_macs'] : [];
$array = [];
foreach ($list as $item) {
$item = strtoupper($item);
if (Base::isMac($item)) {
$array[$item] = [
'mac' => $item,
$item['mac'] = strtoupper($item['mac']);
if (Base::isMac($item['mac'])) {
$array[$item['mac']] = [
'mac' => $item['mac'],
'remark' => $item['remark'],
];
}
}