|
|
@@ -10,6 +10,7 @@ use App\Http\Requests\API\User\CreateRequest;
|
|
|
use App\Http\Requests\API\User\UpdateRequest;
|
|
|
use App\Http\Resources\API\UserInfoResource;
|
|
|
use App\Http\Resources\API\UserSimpleResource;
|
|
|
+use App\Models\Company;
|
|
|
use App\Models\Department;
|
|
|
use App\Models\Enums\RequirementStatus;
|
|
|
use App\Models\Menu;
|
|
|
@@ -18,6 +19,7 @@ use App\Models\Role;
|
|
|
use App\Models\Scopes\CompanyScope;
|
|
|
use App\Models\User;
|
|
|
use Illuminate\Contracts\Encryption\DecryptException;
|
|
|
+use Illuminate\Database\Query\Builder;
|
|
|
use Illuminate\Http\Request;
|
|
|
use Illuminate\Support\Facades\Auth;
|
|
|
use Illuminate\Support\Facades\Cache;
|
|
|
@@ -168,7 +170,8 @@ class UserController extends Controller
|
|
|
|
|
|
public function show(string $id)
|
|
|
{
|
|
|
- $user = User::query()->allowed()->findOrFail($id);
|
|
|
+ $company = Company::query()->where("id", Auth::user()->company_id)->orWhere('parent_id', Auth::user()->company_id)->pluck("id");
|
|
|
+ $user = User::query()->whereIn('company_id',$company->toArray())->findOrFail($id);
|
|
|
return new UserInfoResource($user);
|
|
|
}
|
|
|
|
lsm12139