Merge branch 'refs/heads/feature/gongfu' into feature/data-permission
This commit is contained in:
commit
a134b18dc5
|
|
@ -31,6 +31,7 @@
|
||||||
SELECT u.id,c.agency_company_name AS 'companyName',u.user_name AS 'name',u.user_email AS 'email',u.user_avatar AS 'avatar'
|
SELECT u.id,c.agency_company_name AS 'companyName',u.user_name AS 'name',u.user_email AS 'email',u.user_avatar AS 'avatar'
|
||||||
,a.`name` AS 'areaName',0 AS 'userState',u.create_by AS 'createBy',u.create_time AS 'createTime',u.update_by AS 'updateBy'
|
,a.`name` AS 'areaName',0 AS 'userState',u.create_by AS 'createBy',u.create_time AS 'createTime',u.update_by AS 'updateBy'
|
||||||
,u.update_time AS 'updateTime',null AS 'lastLoginTime',null AS 'expireTime',false AS 'isPrimary',0 AS 'state'
|
,u.update_time AS 'updateTime',null AS 'lastLoginTime',null AS 'expireTime',false AS 'isPrimary',0 AS 'state'
|
||||||
|
,u.user_type as 'type'
|
||||||
FROM app_user_applyfor u
|
FROM app_user_applyfor u
|
||||||
INNER JOIN t_base_customer c ON u.company_id=c.id
|
INNER JOIN t_base_customer c ON u.company_id=c.id
|
||||||
INNER JOIN app_area a ON u.area_id=a.id
|
INNER JOIN app_area a ON u.area_id=a.id
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue