Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
T
tl_estate
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
hujun
tl_estate
Commits
8574926e
Commit
8574926e
authored
Jul 11, 2019
by
hujun
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
所属城市商铺
parent
db62d9be
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
6 deletions
+5
-6
WatchShop.php
application/index/controller/WatchShop.php
+1
-0
AppointWatchShop.php
application/model/AppointWatchShop.php
+4
-6
No files found.
application/index/controller/WatchShop.php
View file @
8574926e
...
...
@@ -80,6 +80,7 @@ class WatchShop extends Basic
if
(
$params
[
'check_status'
]
==
2
)
{
$where
[
'a.appoint_agent_id'
]
=
$this
->
userId
;
$where
[
'd.site_id'
]
=
$this
->
siteId
;
$where
[
'c.city'
]
=
$this
->
city
;
$data
[
'list'
]
=
$applies
->
getAppointWatchOurList
(
$pageNo
,
$pageSize
,
'id DESC'
,
'a.*'
,
$where
);
$data
[
'total'
]
=
$applies
->
getAppointWatchOurTotal
(
$where
);
}
...
...
application/model/AppointWatchShop.php
View file @
8574926e
...
...
@@ -81,9 +81,8 @@ class AppointWatchShop extends BaseModel
return
$this
->
field
(
$field
)
->
alias
(
'a'
)
->
join
(
'u_users b'
,
'a.user_id=b.id'
,
'left'
)
->
join
(
'u_user_agent d'
,
'b.id=d.user_id'
,
'left'
)
->
join
(
'a_agents c'
,
'd.agent_id=c.id'
,
'left'
)
->
join
(
'u_user_agent d'
,
'a.user_id=d.user_id'
,
'left'
)
->
join
(
'g_houses c'
,
'a.house_id=c.id'
,
'left'
)
->
where
(
$params
)
->
order
(
$order_
)
->
limit
(
$pageSize
)
...
...
@@ -102,9 +101,8 @@ class AppointWatchShop extends BaseModel
$params
[
'd.is_del'
]
=
0
;
return
$this
->
alias
(
'a'
)
->
join
(
'u_users b'
,
'a.user_id=b.id'
,
'left'
)
->
join
(
'u_user_agent d'
,
'b.id=d.user_id'
,
'left'
)
->
join
(
'a_agents c'
,
'd.agent_id=c.id'
,
'left'
)
->
join
(
'u_user_agent d'
,
'a.user_id=d.user_id'
,
'left'
)
->
join
(
'g_houses c'
,
'a.house_id=c.id'
,
'left'
)
->
where
(
$params
)
->
count
();
}
...
...
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