Skip to content

L
laravelzh
Commit bd897ea1 authored by 冯超鹏's avatar 冯超鹏
Browse files
Options

no message

parent 4c0a472a
Pipeline #132 failed with stages
      Hide whitespace changes
      Inline Side-by-side
      Showing with 6 additions and 4 deletions
      app/Http/Controllers/DevicesController.php
      View file @ bd897ea1
      ...@@ -473,16 +473,18 @@ class DevicesController extends Controller ...@@ -473,16 +473,18 @@ class DevicesController extends Controller
      $where = []; $where = [];
      if ($request->has('uid')) { if ($request->has('uid')) {
      $user_id = $request->get('uid'); $user_id = $request->get('uid');
      $where['uid'] = $user_id; $where['device.uid'] = $user_id;
      } }
      $data = DB::table('device') $data = DB::table('device')
      ->select('id', 'uid', 'nd', 'deviceinfo', 'devicenum', 'devicecoord', 'devicepolice', 'deviceremark', 'devicelinkman') ->join('status as s','device.devicepolice','=','s.id')
      ->select('device.id', 'device.uid', 'device.nd', 'device.deviceinfo', 'device.devicenum', 'device.devicecoord', 'device.devicepolice', 'device.deviceremark', 'device.devicelinkman','s.status_name')
      ->where($where) ->where($where)
      ->get(); ->get();
      } else { } else {
      $data = DB::table('device') $data = DB::table('device')
      ->select('id', 'uid', 'nd', 'deviceinfo', 'devicenum', 'devicecoord', 'devicepolice', 'deviceremark', 'devicelinkman') ->join('status as s','device.devicepolice','=','s.id')
      ->where('uid','=',Auth::id()) ->select('device.id', 'device.uid', 'device.nd', 'device.deviceinfo', 'device.devicenum', 'device.devicecoord', 'device.devicepolice', 'device.deviceremark', 'device.devicelinkman','s.status_name')
      ->where('device.uid','=',Auth::id())
      ->get(); ->get();
      } }
      ......
      Markdown is supported
      0% or
      You are about to add 0 people to the discussion. Proceed with caution.
      Finish editing this message first!
      Please register or to comment