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
d9ebd2d2
Commit
d9ebd2d2
authored
Jun 13, 2019
by
zhuwei
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1
parent
867bf5c4
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
3 deletions
+4
-3
User.php
application/api_broker/controller/User.php
+2
-1
BatchProcessing.php
application/index/controller/BatchProcessing.php
+1
-1
UserLog.php
application/index/controller/UserLog.php
+1
-1
No files found.
application/api_broker/controller/User.php
View file @
d9ebd2d2
...
...
@@ -734,7 +734,8 @@ class User extends Basic
$pageSize
=
empty
(
$params
[
'page_size'
])
?
15
:
$params
[
'page_size'
];
if
(
isset
(
$params
[
'entrust_type'
])
&&
(
$params
[
'entrust_type'
]
==
1
)){
$result
=
$this
->
OfficeUserLogService
->
phoneFollowUpNew
(
$user_id
,
$this
->
siteId
,
$pageNo
,
$pageSize
);
// $result = $this->OfficeUserLogService->phoneFollowUpNew($user_id,$this->siteId,$pageNo,$pageSize);
return
$this
->
response
(
"200"
,
"success!"
,
null
);
}
else
{
$result
=
$this
->
userLogService
->
phoneFollowUpNew
(
$user_id
,
$this
->
siteId
,
$pageNo
,
$pageSize
);
}
...
...
application/index/controller/BatchProcessing.php
View file @
d9ebd2d2
...
...
@@ -10,7 +10,7 @@ use app\model\OfficeGBuilding;
use
think\Log
;
/**
*
批量处理控制器(数据库一些数据需要批量处理下)
*
拉取经纬度
* Class BatchProcessing
* @package app\index\controller
*/
...
...
application/index/controller/UserLog.php
View file @
d9ebd2d2
...
...
@@ -119,7 +119,7 @@ class UserLog extends Basic{
if
(
$params
[
'entrust_type'
]
==
1
){
$result
=
$this
->
OfficeUserLogService
->
phoneFollowUpNew
(
$user_id
,
$this
->
siteId
,
$pageNo
,
$pageSize
);
return
$this
->
response
(
"200"
,
"success!"
,
''
);
}
else
{
$result
=
$this
->
service_
->
phoneFollowUpNew
(
$user_id
,
$this
->
siteId
,
$pageNo
,
$pageSize
);
}
...
...
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