From 4645d3f50791d5ba966de059bb05c27e87f8d275 Mon Sep 17 00:00:00 2001 From: shuixiang Date: Sat, 11 Sep 2021 10:21:24 +0800 Subject: [PATCH] =?UTF-8?q?fix=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/AdminAgent/Controllers/WorkorderController.php | 4 +++- app/AdminGuide/Controllers/WorkorderController.php | 4 +++- app/AdminSupplier/Controllers/WorkorderController.php | 5 +++++ 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/app/AdminAgent/Controllers/WorkorderController.php b/app/AdminAgent/Controllers/WorkorderController.php index fa26c8f..7c789ca 100755 --- a/app/AdminAgent/Controllers/WorkorderController.php +++ b/app/AdminAgent/Controllers/WorkorderController.php @@ -37,7 +37,9 @@ class WorkorderController extends AdminController $workorder = \App\Models\Workorder::query() ->with(['point','publisher']) ->withCount(['items' => function($query) { - $query->where('is_read', 0); + $query->where('is_read', 0) + ->where('point_id',Admin::user()->id) + ->where('point_type',DemandTraits::$col[0]); }]) ->where(['publisher_id' => Admin::user()->id,'publisher_type' => DemandTraits::$col[0]]) ->orWhere(function ($query) { diff --git a/app/AdminGuide/Controllers/WorkorderController.php b/app/AdminGuide/Controllers/WorkorderController.php index 8cb2ae1..53fb9ba 100755 --- a/app/AdminGuide/Controllers/WorkorderController.php +++ b/app/AdminGuide/Controllers/WorkorderController.php @@ -37,7 +37,9 @@ class WorkorderController extends AdminController $workorder = \App\Models\Workorder::query() ->with(['point','publisher']) ->withCount(['items' => function($query) { - $query->where('is_read', 0); + $query->where('is_read', 0) + ->where('point_id',Admin::user()->id) + ->where('point_type',DemandTraits::$col[2]); }]) ->where(['publisher_id' => Admin::user()->id,'publisher_type' => DemandTraits::$col[2]]) ->orWhere(function ($query) { diff --git a/app/AdminSupplier/Controllers/WorkorderController.php b/app/AdminSupplier/Controllers/WorkorderController.php index 1f2f2b3..74c64d3 100755 --- a/app/AdminSupplier/Controllers/WorkorderController.php +++ b/app/AdminSupplier/Controllers/WorkorderController.php @@ -35,6 +35,11 @@ class WorkorderController extends AdminController $workorder = \App\Models\Workorder::query() ->with(['point','publisher']) + ->withCount(['items' => function($query) { + $query->where('is_read', 0) + ->where('point_id',Admin::user()->id) + ->where('point_type',DemandTraits::$col[1]); + }]) ->where(['publisher_id' => Admin::user()->id,'publisher_type' => DemandTraits::$col[1]]) ->orWhere(function ($query) { $query->where('point_id',Admin::user()->id)