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
39d2b788
Commit
39d2b788
authored
Jul 18, 2019
by
zhuwei
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
app 客户 like 站点
parent
a387f2f7
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
5 deletions
+6
-5
User.php
application/api_broker/controller/User.php
+4
-3
Users.php
application/model/Users.php
+2
-2
No files found.
application/api_broker/controller/User.php
View file @
39d2b788
...
...
@@ -153,6 +153,8 @@ class User extends Basic
$user_id_str
=
$this
->
getUserIDList
(
$params
[
'agent_id'
]);
$conditions
[
'a.id'
]
=
[
'in'
,
$user_id_str
];
// $conditions['a.id'] = $params['agent_id'];
if
(
isset
(
$params
[
'user_status'
]))
{
$conditions
[
'a.user_status'
]
=
$params
[
'user_status'
];
}
...
...
@@ -237,12 +239,11 @@ class User extends Basic
}
if
(
isset
(
$params
[
'site_id'
])
)
{
$conditions
[
'
s.site_id'
]
=
$params
[
'site_id'
];
$conditions
[
'
a.site_ids'
]
=
[
'LIKE'
,
'%'
.
$params
[
'site_id'
]
.
'%'
];
}
else
{
$conditions
[
'
s.site_id'
]
=
$this
->
siteId
;
$conditions
[
'
a.site_ids'
]
=
[
'LIKE'
,
'%'
.
$this
->
siteId
.
'%'
]
;
}
//委托类型
if
(
isset
(
$params
[
'entrust_type'
])
&&
is_numeric
(
$params
[
'entrust_type'
])){
$conditions
[
'a.entrust_type'
]
=
$params
[
'entrust_type'
];
...
...
application/model/Users.php
View file @
39d2b788
...
...
@@ -694,11 +694,11 @@ class Users extends Model
*/
public
function
selectUserList
(
$field
,
$params
,
$pageNo
,
$pageSize
,
$order
)
{
$params
[
's.is_del'
]
=
0
;
//
$params['s.is_del'] = 0;
$result
=
Db
::
table
(
$this
->
table
)
->
field
(
$field
)
->
alias
(
'a'
)
->
join
(
"u_user_site s"
,
"a.id=s.user_id"
,
"right"
)
//
->join("u_user_site s", "a.id=s.user_id", "right")
->
where
(
$params
)
->
order
(
$order
)
->
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