NASER fix conflicts

2026-02-16 10:24:21 +00:00
parent ba8e2950e4 a0a788ce53
commit 1250f18c88
12 changed files with 238 additions and 71 deletions
@@ -7,6 +7,7 @@ use App\Http\Controllers\SuperController;
 use App\Models\Permission;
 use App\Models\User;
 use Illuminate\Http\Request;
+use App\Models\Setting;

 class UserController extends SuperController
 {
@@ -29,6 +30,9 @@ class UserController extends SuperController
            ->findOrFail(auth()->id());
 //        $permission = Permission::where('user_type',$user->user_type)->select('rid')->distinct('rid')->get()->pluck('rid')->toArray();
 //        $user['permission'] = $permission;
+        $query = Setting::query();
+        $settings = $query->get();
+        $user->settings= $settings;
        return response()->json($user);

    }