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
0ca19c32
Commit
0ca19c32
authored
Jan 11, 2019
by
hujun
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
name
parent
22a14a6d
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
21 additions
and
4 deletions
+21
-4
Label.php
application/index/controller/Label.php
+2
-2
UPhoneFollowUpTemporary.php
application/model/UPhoneFollowUpTemporary.php
+19
-2
No files found.
application/index/controller/Label.php
View file @
0ca19c32
...
@@ -163,8 +163,8 @@ class Label extends Basic
...
@@ -163,8 +163,8 @@ class Label extends Basic
if
(
empty
(
$this
->
params
[
'user_id'
]))
{
if
(
empty
(
$this
->
params
[
'user_id'
]))
{
return
$this
->
response
(
101
,
'没有用户信息'
);
return
$this
->
response
(
101
,
'没有用户信息'
);
}
}
$follow
=
new
UPhoneFollowUpTemporary
(
$this
->
siteId
);
$follow
_temp
=
new
UPhoneFollowUpTemporary
(
$this
->
siteId
);
$user_status
=
$follow
->
getUserFollowKey
(
'user_status'
,
[
'user_id'
=>
$this
->
params
[
'user_id'
]],
'id DESC'
);
$user_status
=
$follow
_temp
->
getUserFollowKey
(
'user_status'
,
[
'user_id'
=>
$this
->
params
[
'user_id'
]],
'id DESC'
);
if
(
empty
(
$user_status
))
{
if
(
empty
(
$user_status
))
{
$follow
=
new
UPhoneFollowUp
(
$this
->
siteId
);
$follow
=
new
UPhoneFollowUp
(
$this
->
siteId
);
$user_status
=
$follow
->
getUserFollowKey
(
'user_status'
,
[
'user_id'
=>
$this
->
params
[
'user_id'
]],
'id DESC'
);
$user_status
=
$follow
->
getUserFollowKey
(
'user_status'
,
[
'user_id'
=>
$this
->
params
[
'user_id'
]],
'id DESC'
);
...
...
application/model/UPhoneFollowUpTemporary.php
View file @
0ca19c32
...
@@ -190,7 +190,18 @@ class UPhoneFollowUpTemporary extends BaseModel
...
@@ -190,7 +190,18 @@ class UPhoneFollowUpTemporary extends BaseModel
return
$this
->
follow_up
->
execute
(
$sql
);
return
$this
->
follow_up
->
execute
(
$sql
);
}
}
public
function
getFollowListV3
(
$site_id
,
$pageNo
=
1
,
$pageSize
=
15
,
$where
,
$filed
=
'`id`, `user_id`, `create_time`, `content`, `user_status`, `labels_id`, `agent_id`'
)
{
/**
* @param $site_id
* @param int $pageNo
* @param int $pageSize
* @param $where
* @param string $filed
* @return false|null|\PDOStatement|string|\think\Collection
* @throws \think\db\exception\DataNotFoundException
* @throws \think\db\exception\ModelNotFoundException
* @throws \think\exception\DbException
*/
public
function
getFollowListV3
(
$site_id
,
$pageNo
,
$pageSize
,
$where
,
$filed
=
'`id`, `user_id`, `create_time`, `content`, `user_status`, `labels_id`, `agent_id`'
)
{
if
(
!
$this
->
createTable
()){
if
(
!
$this
->
createTable
()){
return
null
;
return
null
;
}
}
...
@@ -206,11 +217,17 @@ class UPhoneFollowUpTemporary extends BaseModel
...
@@ -206,11 +217,17 @@ class UPhoneFollowUpTemporary extends BaseModel
}
}
/**
* @param $field
* @param $where
* @param string $order
* @return null
*/
public
function
getUserFollowKey
(
$field
,
$where
,
$order
=
'id asc'
)
{
public
function
getUserFollowKey
(
$field
,
$where
,
$order
=
'id asc'
)
{
if
(
!
$this
->
createTable
()){
if
(
!
$this
->
createTable
()){
return
null
;
return
null
;
}
}
return
$this
->
UPhoneFollowU
p
->
where
(
$where
)
return
$this
->
follow_u
p
->
where
(
$where
)
->
order
(
$order
)
->
order
(
$order
)
->
value
(
$field
);
->
value
(
$field
);
}
}
...
...
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