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
84d1e864
Commit
84d1e864
authored
Oct 10, 2018
by
zhuwei
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bug
parent
15fa5a2c
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
4 deletions
+2
-4
HomePageLog.php
application/api_broker/controller/HomePageLog.php
+1
-2
GHousesFollowUp.php
application/model/GHousesFollowUp.php
+1
-2
No files found.
application/api_broker/controller/HomePageLog.php
View file @
84d1e864
...
@@ -211,9 +211,8 @@ class HomePageLog extends Basic
...
@@ -211,9 +211,8 @@ class HomePageLog extends Basic
}
}
}
}
$join
=
[];
$order
=
"f.id desc"
;
$order
=
"f.id desc"
;
$result
=
$this
->
gHouseFollowUpModel
->
getSearch
(
$pageNo
,
$pageSize
,
$order
,
$field
,
$
join
,
$
where_
,
""
);
$result
=
$this
->
gHouseFollowUpModel
->
getSearch
(
$pageNo
,
$pageSize
,
$order
,
$field
,
$where_
,
""
);
foreach
(
$result
as
$key
=>
$value
)
{
foreach
(
$result
as
$key
=>
$value
)
{
$agent_params
=
[];
$agent_params
=
[];
$agent_params
[
"a.id"
]
=
$value
[
'agent_id'
];
$agent_params
[
"a.id"
]
=
$value
[
'agent_id'
];
...
...
application/model/GHousesFollowUp.php
View file @
84d1e864
...
@@ -113,12 +113,11 @@ class GHousesFollowUp extends BaseModel
...
@@ -113,12 +113,11 @@ class GHousesFollowUp extends BaseModel
* @throws \think\db\exception\ModelNotFoundException
* @throws \think\db\exception\ModelNotFoundException
* @throws \think\exception\DbException
* @throws \think\exception\DbException
*/
*/
public
function
getSearch
(
$p
=
1
,
$pageSize
=
15
,
$order_
=
'id desc'
,
$field
,
$
join
,
$
where
,
$group
)
public
function
getSearch
(
$p
=
1
,
$pageSize
=
15
,
$order_
=
'id desc'
,
$field
,
$where
,
$group
)
{
{
$data
=
$this
->
db_
$data
=
$this
->
db_
->
field
(
$field
)
->
field
(
$field
)
->
alias
(
'f'
)
->
alias
(
'f'
)
->
join
(
$join
)
->
join
(
'a_agents a'
,
'f.agent_id = a.id'
,
'left'
)
->
join
(
'a_agents a'
,
'f.agent_id = a.id'
,
'left'
)
->
where
(
$where
)
->
where
(
$where
)
->
group
(
$group
)
->
group
(
$group
)
...
...
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