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
6fcce7f6
Commit
6fcce7f6
authored
Jul 10, 2019
by
zhuwei
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1
parent
dc7cdb0e
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
1 deletion
+2
-1
PerformanceService.php
application/api_broker/service/PerformanceService.php
+1
-1
UserAgentModel.php
application/model/UserAgentModel.php
+1
-0
No files found.
application/api_broker/service/PerformanceService.php
View file @
6fcce7f6
...
@@ -757,7 +757,7 @@ class PerformanceService
...
@@ -757,7 +757,7 @@ class PerformanceService
$params
=
$this
->
getAgentIdPcInfo
(
$id
,
$type
,
$start_time
,
$end_time
);
$params
=
$this
->
getAgentIdPcInfo
(
$id
,
$type
,
$start_time
,
$end_time
);
if
(
!
$params
)
if
(
!
$params
)
return
[
"code"
=>
101
,
"date"
=>
"传入的参数错误"
];
return
[
"code"
=>
101
,
"date"
=>
"传入的参数错误"
];
$field
=
"
a
.id,b.user_name,b.user_phone,b.user_nick,a.create_time,a.agent_id,b.user_status,b.source,
$field
=
"
b
.id,b.user_name,b.user_phone,b.user_nick,a.create_time,a.agent_id,b.user_status,b.source,
b.industry_type,b.area_demand,c.name"
;
b.industry_type,b.area_demand,c.name"
;
$m_user_agent
=
new
UserAgentModel
();
$m_user_agent
=
new
UserAgentModel
();
$addUserList
=
$m_user_agent
->
getAddUserList
(
$params
,
$field
,
$page_no
,
$page_size
);
$addUserList
=
$m_user_agent
->
getAddUserList
(
$params
,
$field
,
$page_no
,
$page_size
);
...
...
application/model/UserAgentModel.php
View file @
6fcce7f6
...
@@ -142,6 +142,7 @@ class UserAgentModel extends Model
...
@@ -142,6 +142,7 @@ class UserAgentModel extends Model
if
(
isset
(
$params
[
"create_time"
]))
{
if
(
isset
(
$params
[
"create_time"
]))
{
$where_
[
"a.create_time"
]
=
$params
[
"create_time"
];
$where_
[
"a.create_time"
]
=
$params
[
"create_time"
];
}
}
$where_
[
"b.entrust_type"
]
=
0
;
$result
=
$this
->
db_
$result
=
$this
->
db_
->
field
(
$field
)
->
field
(
$field
)
->
alias
(
'a'
)
->
alias
(
'a'
)
...
...
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