[FEAT] 機台權限功能增強、UI 輕巧化與多語系優化
All checks were successful
star-cloud-deploy-demo / deploy-demo (push) Successful in 46s

This commit is contained in:
2026-03-30 16:15:04 +08:00
parent f3b2c3e018
commit 2c9dc793d7
10 changed files with 248 additions and 142 deletions

View File

@@ -3,6 +3,7 @@
namespace App\Http\Controllers\Admin\Machine;
use App\Http\Controllers\Admin\AdminController;
use App\Models\System\Company;
use App\Models\Machine\Machine;
use App\Models\System\User;
use Illuminate\Http\Request;
@@ -19,6 +20,7 @@ class MachinePermissionController extends AdminController
{
$per_page = $request->input('per_page', 10);
$search = $request->input('search');
$company_id = $request->input('company_id');
$currentUser = auth()->user();
@@ -33,6 +35,9 @@ class MachinePermissionController extends AdminController
// 非系統管理員僅能看到同公司的帳號 (因 User Model 排除 TenantScoped 全域過濾,需手動注入)
if (!$currentUser->isSystemAdmin()) {
$userQuery->where('company_id', $currentUser->company_id);
} elseif ($company_id) {
// 系統管理員的篩選邏輯
$userQuery->where('company_id', $company_id);
}
if ($search) {
@@ -44,8 +49,9 @@ class MachinePermissionController extends AdminController
}
$users_list = $userQuery->latest()->paginate($per_page)->withQueryString();
$companies = $currentUser->isSystemAdmin() ? Company::all() : collect();
return view('admin.machines.permissions', compact('users_list'));
return view('admin.machines.permissions', compact('users_list', 'companies'));
}
/**