|
@@ -57,9 +57,13 @@
|
|
user.price,
|
|
user.price,
|
|
user.status,
|
|
user.status,
|
|
user.create_time,
|
|
user.create_time,
|
|
- balance.balance
|
|
|
|
|
|
+ balance.balance,
|
|
|
|
+ roleName.role_name
|
|
from
|
|
from
|
|
h_user user left join h_user_balance balance on user.id = balance.user_id
|
|
h_user user left join h_user_balance balance on user.id = balance.user_id
|
|
|
|
+ left join (
|
|
|
|
+ select distinct user_id, role.role_name from h_user_role_permission permission
|
|
|
|
+ left join h_role role on permission.role_id = role.id) roleName on user.id = roleName.user_id
|
|
<where>
|
|
<where>
|
|
and user.activated = 1
|
|
and user.activated = 1
|
|
<if test="query.username != null and query.username != ''">
|
|
<if test="query.username != null and query.username != ''">
|