Merge branch 'master' of /data/git/tiantian2

3 years ago · 92a472a2dd
parent 637905cccc d2a31e8c4f
commit 92a472a2dd
1 changed files with 1 additions and 1 deletions
--- a/app/Http/Controllers/Admin/OrdersController.php
+++ b/app/Http/Controllers/Admin/OrdersController.php
@ -78,7 +78,7 @@ class OrdersController extends CommonController
        $data = $data->paginate(10);
        foreach ($data as $order) {
            $factors = json_decode($order->factors,true);
-            $order->department = collect($factors)->where('factor_name','所在科室')->first()->factor_item_name;
+            $order->department = (collect($factors)->where('factor_name','所在科室')->first()->factor_item_name)??'';
            $order = $order->refreshTotal();
        }
        return view($this->bladePath . ".index", compact("data", "project_id", "month", "project"));