Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
R
ruer_cms
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
蔡闯
ruer_cms
Commits
e8784548
Commit
e8784548
authored
Feb 19, 2021
by
蔡闯
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
2021-2-19
parent
0b853c2b
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
0 deletions
+3
-0
app/api/controller/Index.php
app/api/controller/Index.php
+3
-0
No files found.
app/api/controller/Index.php
View file @
e8784548
...
...
@@ -255,9 +255,11 @@ class Index extends Base
->
leftJoin
(
'house_village hvi'
,
'hvi.village_id = hub.village_id'
)
->
field
(
'hvi.village_id,hvi.village_name,hv.vacancy_code,hv.layout_id,hub.pass_time,hub.type,hub.status,hub.vacancy_id,hvi.village_logo,hv.name,hv.phone,hub.house_user_bind_id'
)
->
find
();
$res
=
Common
::
getVacancyAddress
(
$data
[
'vacancy_code'
],
$data
[
'layout_id'
]);
$data
[
'vacancy_address'
]
=
$res
[
'vacancy_address'
];
//获取用户车辆信息
$cars
=
Db
::
name
(
'car'
)
->
where
([
'uid'
=>
$this
->
uid
,
'village_id'
=>
$data
[
'village_id'
]])
->
select
()
->
toArray
();
$data
[
'car'
]
=
$cars
;
if
(
$data
[
'type'
]
==
0
){
...
...
@@ -302,6 +304,7 @@ class Index extends Base
public
function
getUser
(
$where
){
$user
=
Db
::
name
(
'house_user_bind'
)
->
alias
(
'hub'
)
->
leftJoin
(
'user'
,
'user.uid = hub.uid'
)
->
where
(
$where
)
->
where
(
'hub.uid'
,
'<>'
,
$this
->
uid
)
->
whereNotIn
(
'hub.status'
,[
0
,
3
])
->
where
(
'hub.uid'
,
'<>'
,
null
)
->
field
(
'hub.house_user_bind_id,hub.name,hub.phone,user.avatar,user.uid,hub.village_id,hub.status,hub.type'
)
->
select
()
->
toArray
();
...
...
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