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
130f200a
Commit
130f200a
authored
Jan 25, 2019
by
hujun
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改方法 去除排序
parent
adbfa797
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
7 deletions
+7
-7
HomePageLog.php
application/api_broker/controller/HomePageLog.php
+1
-1
PhoneFollowUpService.php
application/index/service/PhoneFollowUpService.php
+1
-1
Users.php
application/model/Users.php
+5
-5
No files found.
application/api_broker/controller/HomePageLog.php
View file @
130f200a
...
@@ -114,7 +114,7 @@ class HomePageLog extends Basic
...
@@ -114,7 +114,7 @@ class HomePageLog extends Basic
$date
=
date
(
"Y-m-d"
,
time
());
$date
=
date
(
"Y-m-d"
,
time
());
if
(
$start_time
>=
$date
&&
$start_time
<=
$date
.
" 23:59:59"
)
{
if
(
$start_time
>=
$date
&&
$start_time
<=
$date
.
" 23:59:59"
)
{
$result
=
$this
->
phoneFollowUpTemporary
->
getFollowList
(
$pageNo
,
$pageSize
,
$order_
=
'
id desc
'
,
$field
,
$where_
);
$result
=
$this
->
phoneFollowUpTemporary
->
getFollowList
(
$pageNo
,
$pageSize
,
$order_
=
''
,
$field
,
$where_
);
}
else
{
}
else
{
$result
=
$this
->
uPhoneFollowUpModel
->
getFollowList
(
$pageNo
,
$pageSize
,
'id desc'
,
$field
,
$where
);
$result
=
$this
->
uPhoneFollowUpModel
->
getFollowList
(
$pageNo
,
$pageSize
,
'id desc'
,
$field
,
$where
);
}
}
...
...
application/index/service/PhoneFollowUpService.php
View file @
130f200a
...
@@ -118,7 +118,7 @@ class PhoneFollowUpService
...
@@ -118,7 +118,7 @@ class PhoneFollowUpService
#客户是否在保护期内(0:保护器内 1:超过保护期)
#客户是否在保护期内(0:保护器内 1:超过保护期)
$data
[
$k
][
'is_outstrip_twenty_four_hours'
]
=
$s_user_service
->
isUserProtect
(
$v
[
'user_id'
]);
$data
[
$k
][
'is_outstrip_twenty_four_hours'
]
=
$s_user_service
->
isUserProtect
(
$v
[
'user_id'
]);
#判断当天被拨打是否超过5次,同时判断是否当前经纪人跟当前客户是否有电话绑定(0允许拨打 1不允许拨打)
#判断当天被拨打是否超过5次,同时判断是否当前经纪人跟当前客户是否有电话绑定(0允许拨打 1不允许拨打)
$user_res
=
$m_user
->
verifyUser
(
'user_name,user_phone'
,
''
,
[
'id'
=>
$v
[
'user_id'
]
]
);
$user_res
=
$m_user
->
getUserDetailStreamline
(
$v
[
'user_id'
],
'user_name,user_phone'
);
$data
[
$k
][
'is_outpace_call_num'
]
=
$s_user_Log_service
->
userDetailIsOutpaceCallNum
(
$v
[
'user_id'
],
$user_res
[
'user_phone'
],
$agent_id
);
$data
[
$k
][
'is_outpace_call_num'
]
=
$s_user_Log_service
->
userDetailIsOutpaceCallNum
(
$v
[
'user_id'
],
$user_res
[
'user_phone'
],
$agent_id
);
$data
[
$k
][
'label_name'
]
=
array_key_exists
(
$v
[
'labels_id'
],
$label_data
)
?
$label_data
[
$v
[
'labels_id'
]]
:
''
;
$data
[
$k
][
'label_name'
]
=
array_key_exists
(
$v
[
'labels_id'
],
$label_data
)
?
$label_data
[
$v
[
'labels_id'
]]
:
''
;
}
}
...
...
application/model/Users.php
View file @
130f200a
...
@@ -1008,15 +1008,15 @@ class Users extends Model
...
@@ -1008,15 +1008,15 @@ class Users extends Model
*/
*/
public
function
verifyUser
(
$field
,
$join
,
$params
)
public
function
verifyUser
(
$field
,
$join
,
$params
)
{
{
try
{
//
try {
$data
=
$this
->
field
(
$field
)
$data
=
$this
->
field
(
$field
)
->
alias
(
'a'
)
->
alias
(
'a'
)
->
join
(
$join
)
//
->join($join)
->
where
(
$params
)
->
where
(
$params
)
->
find
();
->
find
();
}
catch
(
\Exception
$e
)
{
//
} catch (\Exception $e) {
$data
=
[];
//
$data = [];
}
//
}
return
$data
;
return
$data
;
}
}
...
...
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