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
1777244f
Commit
1777244f
authored
Jul 10, 2019
by
zhuwei
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1
parent
23977058
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
6 deletions
+7
-6
UserSiteService.php
application/index/service/UserSiteService.php
+0
-3
Users.php
application/model/Users.php
+7
-3
No files found.
application/index/service/UserSiteService.php
View file @
1777244f
...
...
@@ -157,10 +157,7 @@ class UserSiteService
*/
public
function
moveUserSiteCount
(){
$params
[]
=
[
'EXP'
,
'site_ids IS NOT NULL '
];
$user_count
=
$this
->
m_user
->
moveUserSiteCount
(
$params
);
return
$user_count
;
}
...
...
application/model/Users.php
View file @
1777244f
...
...
@@ -499,15 +499,19 @@ class Users extends Model
{
$where_
=
[];
if
(
isset
(
$params
[
"agent_id"
]))
{
$where_
[
"agent_id"
]
=
$params
[
"agent_id"
];
$where_
[
"
b.
agent_id"
]
=
$params
[
"agent_id"
];
}
if
(
isset
(
$params
[
"create_time"
]))
{
$where_
[
"create_time"
]
=
$params
[
"create_time"
];
$start_time
=
$params
[
"create_time"
][
1
][
0
];
$end_time
=
$params
[
"create_time"
][
1
][
1
];
$where_
[]
=
[
'EXP'
,
"b.create_time BETWEEN '
{
$start_time
}
' AND '
{
$end_time
}
' OR b.update_time BETWEEN '
{
$start_time
}
' AND '
{
$end_time
}
' "
];
}
return
Db
::
table
(
$this
->
table
)
->
alias
(
"a"
)
->
join
(
"u_user_agent b"
,
"b.user_id=a.id"
,
"left"
)
->
where
(
$where_
)
->
count
();
}
/**
...
...
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