diff --git a/app/Http/Controllers/Api/SystemController.php b/app/Http/Controllers/Api/SystemController.php index 5be00603c..cc9ca2878 100755 --- a/app/Http/Controllers/Api/SystemController.php +++ b/app/Http/Controllers/Api/SystemController.php @@ -575,12 +575,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['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); diff --git a/resources/assets/js/pages/manage/dashboard.vue b/resources/assets/js/pages/manage/dashboard.vue index 71f676768..482a4671d 100644 --- a/resources/assets/js/pages/manage/dashboard.vue +++ b/resources/assets/js/pages/manage/dashboard.vue @@ -2,7 +2,9 @@