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

Merge branch 'pro' into pro

Browse Source
This commit is contained in:
gwok
2023-06-06 18:44:32 +08:00
committed by GitHub
parent 3a13b8bf30 905662e963
commit 847d7f98fc
186 changed files with 2277 additions and 10260 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/Http/Controllers/Api/SystemController.php
View File

@@ -578,12 +578,12 @@ class SystemController extends AbstractController
$data['error'][] = '终端MAC与License不匹配';
}
}
if ($data['user_count'] > $data['info']['people']) {
$data['error'][] = '终端用户数超过License限制';
}
if ($data['info']['expired_at'] && strtotime($data['info']['expired_at']) <= Base::time()) {
$data['error'][] = '终端License已过期';
}
}
if ($data['info']['people'] > 0 && $data['user_count'] > $data['info']['people']) {
$data['error'][] = '终端用户数超过License限制';
}
if ($data['info']['expired_at'] && strtotime($data['info']['expired_at']) <= Base::time()) {
$data['error'][] = '终端License已过期';
}
//
return Base::retSuccess('success', $data);