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
46877159
Commit
46877159
authored
Aug 03, 2018
by
clone
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bug
parent
20c24b80
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
20 additions
and
6 deletions
+20
-6
User.php
application/api_broker/controller/User.php
+4
-4
ClientService.php
application/api_broker/service/ClientService.php
+1
-1
UPhoneFollowPp.php
application/model/UPhoneFollowPp.php
+13
-0
Users.php
application/model/Users.php
+2
-1
No files found.
application/api_broker/controller/User.php
View file @
46877159
...
@@ -120,21 +120,21 @@ class User extends Basic
...
@@ -120,21 +120,21 @@ class User extends Basic
if
(
isset
(
$params
[
'status'
]))
{
if
(
isset
(
$params
[
'status'
]))
{
$conditions
[
'status'
]
=
$params
[
'status'
];
$conditions
[
'status'
]
=
$params
[
'status'
];
}
}
$userList
=
$this
->
userModel
->
selectUserList
(
$field
,
$conditions
,
$pageNo
,
$pageSize
,
"id desc"
);
$userList
=
$this
->
userModel
->
selectUserList
(
$field
,
$conditions
,
$pageNo
,
$pageSize
,
"id desc"
);
if
(
empty
(
$userList
))
{
if
(
empty
(
$userList
))
{
return
$this
->
response
(
"200"
,
"此条件没有找到数据"
);
return
$this
->
response
(
"200"
,
"此条件没有找到数据"
);
}
}
$clientService
=
new
ClientService
();
$clientService
=
new
ClientService
();
$list
=
[];
foreach
(
$userList
as
$k
=>
$v
)
{
foreach
(
$userList
as
$k
=>
$v
)
{
$is_show
=
$clientService
->
dialTotal
(
$v
[
"user_id"
]);
$is_show
=
$clientService
->
dialTotal
(
$v
[
"user_id"
]);
if
(
!
$is_show
)
{
if
(
$is_show
)
{
unset
(
$userList
[
$k
]
);
array_push
(
$list
,
$v
);
}
}
}
}
$vip_services
=
new
VipService
();
$vip_services
=
new
VipService
();
$data
[
'examine_vip'
]
=
$vip_services
->
vip
(
$this
->
agentId
);
$data
[
'examine_vip'
]
=
$vip_services
->
vip
(
$this
->
agentId
);
$data
[
'user_date'
]
=
array_merge
(
$userList
)
;
$data
[
'user_date'
]
=
$list
;
return
$this
->
response
(
"200"
,
'request success'
,
$data
);
return
$this
->
response
(
"200"
,
'request success'
,
$data
);
}
}
...
...
application/api_broker/service/ClientService.php
View file @
46877159
...
@@ -37,7 +37,7 @@ class ClientService
...
@@ -37,7 +37,7 @@ class ClientService
$params
[
"create_time"
]
=
array
(
"between"
,
array
(
$start_time
,
$end_time
)
);
$params
[
"create_time"
]
=
array
(
"between"
,
array
(
$start_time
,
$end_time
)
);
$params
[
"user_id"
]
=
$user_id
;
$params
[
"user_id"
]
=
$user_id
;
$total
=
$this
->
uPhoneFollowUpModel
->
get
SearchCount
(
""
,
$params
);
$total
=
$this
->
uPhoneFollowUpModel
->
get
Count
(
$params
);
if
(
$total
>
$num
)
{
if
(
$total
>
$num
)
{
return
false
;
return
false
;
}
else
{
}
else
{
...
...
application/model/UPhoneFollowPp.php
View file @
46877159
...
@@ -87,6 +87,19 @@ class UPhoneFollowPp extends BaseModel
...
@@ -87,6 +87,19 @@ class UPhoneFollowPp extends BaseModel
return
$r
;
return
$r
;
}
}
/**
* @param $join
* @param $where
* @return int
*/
public
function
getCount
(
$where
)
{
$r
=
$this
->
where
(
$where
)
->
count
();
return
$r
;
}
public
function
getUserAgentTotal
(
$params
,
$join
)
public
function
getUserAgentTotal
(
$params
,
$join
)
{
{
...
...
application/model/Users.php
View file @
46877159
...
@@ -542,7 +542,8 @@ class Users extends Model
...
@@ -542,7 +542,8 @@ class Users extends Model
public
function
selectUserList
(
$field
,
$params
,
$pageNo
,
$pageSize
,
$order
=
"id desc"
)
public
function
selectUserList
(
$field
,
$params
,
$pageNo
,
$pageSize
,
$order
=
"id desc"
)
{
{
$result
=
$this
->
field
(
$field
)
$result
=
Db
::
table
(
$this
->
table
)
->
field
(
$field
)
->
where
(
$params
)
->
where
(
$params
)
->
order
(
$order
)
->
order
(
$order
)
->
page
(
$pageNo
)
->
page
(
$pageNo
)
...
...
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