xuanchen/water-back
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

调整地区

Browse Source
This commit is contained in:
徐永宾
2023-01-29 09:48:54 +08:00
parent e17e9dc5ad
commit 70fd7e70be
11 changed files with 108 additions and 188 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
app/Api/Controllers/Area/IndexController.php
View File

@@ -6,7 +6,6 @@ use App\Api\Controllers\Controller;
use App\Api\Resources\Area\AreaCodeCollection;
use App\Api\Resources\Area\AreaResource;
use App\Models\Area;
use App\Models\AreaCode;
use Illuminate\Http\JsonResponse;
use Illuminate\Http\Request;
use Jason\Api\Api;
@@ -24,9 +23,10 @@ class IndexController extends Controller
{
$user = Api::user();
$areas = Area::query()
->whereHas('areaClerks', function ($q) {
$q->where('user_id', Api::userId());
})
->Manager(Api::userId())
// ->whereHas('areaClerks', function ($q) {
// $q->where('user_id', Api::userId());
// })
->get();
return $this->success(AreaResource::collection($areas));
@@ -42,9 +42,7 @@ class IndexController extends Controller
public function show()
{
$area = Area::query()
->whereHas('areaClerks', function ($q) {
$q->where('user_id', Api::userId());
})
->Manager(Api::userId())
->first();
if (! $area) {
@@ -80,9 +78,7 @@ class IndexController extends Controller
$status = $request->status ?? '';
$area = Area::query()
->whereHas('areaClerks', function ($q) {
$q->where('user_id', Api::userId());
})
->Manager(Api::userId())
->first();
if (! $area) {
return $this->failed('您没有管理的区域无法查看');
@@ -109,9 +105,7 @@ class IndexController extends Controller
public function generate(Request $request)
{
$area = Area::query()
->whereHas('areaClerks', function ($q) {
$q->where('user_id', Api::userId());
})
->Manager(Api::userId())
->first();
if (! $area) {
return $this->failed('您没有管理的区域无法查看');