Commit 6c0540e2 authored by 冯超鹏's avatar 冯超鹏

no message

parent e9d76e70
Pipeline #134 failed with stages
......@@ -73,7 +73,7 @@ class UinappHomeController extends Controller
->join('users as u', 'd.uid', '=', 'u.id')
->where('d.username','=',$setdata)
->select('d.*', 't.tname', 'g.gas', 'w.danwei', 's.status_name', 'u.username as nameh', 'u.isadmin')
->first();
->get();
}else{
$data = DB::table('device as d')
->join('device_type as t', 'd.dtype', '=', 't.tid')
......@@ -83,7 +83,7 @@ class UinappHomeController extends Controller
->join('users as u', 'd.uid', '=', 'u.id')
->where('d.devicenum','=',$setdata)
->select('d.*', 't.tname', 'g.gas', 'w.danwei', 's.status_name', 'u.username as nameh', 'u.isadmin')
->first();
->get();
}
return $this->jsonSuccessData($data);
}
......
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