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
85fbbc6a
Commit
85fbbc6a
authored
Aug 15, 2018
by
clone
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bug
parent
3d0495b5
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
6 deletions
+3
-6
HomePageLog.php
application/api_broker/controller/HomePageLog.php
+2
-3
UPhoneFollowPp.php
application/model/UPhoneFollowPp.php
+1
-3
No files found.
application/api_broker/controller/HomePageLog.php
View file @
85fbbc6a
...
...
@@ -81,10 +81,9 @@ class HomePageLog extends Basic
$where_
[
"f.city"
]
=
trim
(
$this
->
city
)
?
trim
(
$this
->
city
)
:
'上海市'
;
$join
=
[];
$order
=
"f.id desc"
;
$result
=
$this
->
uPhoneFollowUpModel
->
getSearch
(
$pageNo
,
$pageSize
,
$order
,
$field
,
$join
,
$where_
,
""
);
$result
=
$this
->
uPhoneFollowUpModel
->
getSearch
(
$pageNo
,
$pageSize
,
$order
,
$field
,
[]
,
$where_
,
""
);
foreach
(
$result
as
$key
=>
$value
)
{
$agent_params
=
[];
...
...
@@ -98,7 +97,7 @@ class HomePageLog extends Basic
}
$count
=
$this
->
uPhoneFollowUpModel
->
getSearchCount
(
$
join
,
$
where_
);
$count
=
$this
->
uPhoneFollowUpModel
->
getSearchCount
(
$where_
);
if
(
count
(
$result
)
>
0
)
{
$list
[
"result"
]
=
$result
;
$list
[
"img_path"
]
=
AGENTHEADERIMGURL
;
...
...
application/model/UPhoneFollowPp.php
View file @
85fbbc6a
...
...
@@ -102,15 +102,13 @@ class UPhoneFollowPp extends BaseModel
}
/**
* @param $join
* @param $where
* @return int
*/
public
function
getSearchCount
(
$
join
,
$
where
)
public
function
getSearchCount
(
$where
)
{
$r
=
$this
->
alias
(
'f'
)
->
join
(
$join
)
->
where
(
$where
)
->
count
();
return
$r
;
...
...
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