Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
L
laravelzh
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
冯超鹏
laravelzh
Commits
5b001948
Commit
5b001948
authored
Jul 23, 2020
by
冯超鹏
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
提交用户
parent
89135b93
Pipeline
#97
canceled with stages
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
13 additions
and
4 deletions
+13
-4
DevicesController.php
app/Http/Controllers/DevicesController.php
+13
-4
No files found.
app/Http/Controllers/DevicesController.php
View file @
5b001948
...
...
@@ -379,10 +379,19 @@ class DevicesController extends Controller
//返回设备当前报警
public
function
police
()
{
$data
=
DB
::
table
(
'reportpolice as r'
)
->
join
(
'status as s'
,
'r.policestatus'
,
'='
,
's.id'
)
->
select
(
'r.*'
,
's.status_name'
)
->
get
();
if
(
!
is_null
(
$this
->
isadmin
()))
{
$data
=
DB
::
table
(
'reportpolice as r'
)
->
join
(
'status as s'
,
'r.policestatus'
,
'='
,
's.id'
)
->
select
(
'r.*'
,
's.status_name'
)
->
get
();
}
else
{
$data
=
DB
::
table
(
'reportpolice as r'
)
->
join
(
'status as s'
,
'r.policestatus'
,
'='
,
's.id'
)
->
join
(
'device as d'
,
'r.devicenumber'
,
'='
,
'd.devicenum'
)
->
where
(
'd.uid'
,
'='
,
Auth
::
id
())
->
select
(
'r.*'
,
's.status_name'
)
->
get
();
}
return
$this
->
jsonSuccessData
(
$data
);
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment