@@ -51,6 +51,7 @@
user.id,
user.username,
user.app_key,
+ user.app_secret,
user.company,
user.contact_name,
user.telephone,
@@ -106,11 +107,13 @@
user.app_key, user.company, balance.balance
from
h_user user
- left join
+ left join
h_user_balance balance
- on
- user.id = balance.user_id
+ on
+ user.id = balance.user_id
where
- activated = 1 and status = 1 and balance.balance is not null
+ activated = 1 and status = 1 and balance.balance is not null
+ union
+ select user_name as app_key, company, ROUND(money/100,2) as balance from t_user where is_lock = 0
</select>
</mapper>