|
|
@@ -2441,12 +2441,14 @@ inner join(
|
|
|
SELECT a.id,a.nickname ,a.share_type as shareType,a.new_channel as newChannel,a.sign_bills as signBills,
|
|
|
a.sign_time as signTime,d.name as adminName ,b.org_code as orgCode,b.location_province as locationProvince,
|
|
|
b.location_city as locationCity,b.location_area as locationArea,e.name as locationProvinceName,
|
|
|
+ ua.awards_status as awardsStatus,ua.awards_time as awardsTime
|
|
|
f.name as locationCityName,g.name as locationAreaName
|
|
|
from `user` a left join organization_identity b on a.id=b.uid left join user_mid c on a.id =c.uid
|
|
|
left join admin d on a.aid=d.id
|
|
|
left join district_glossory e on b.location_province=e.id
|
|
|
left join district_glossory f on b.location_city=f.id
|
|
|
left join district_glossory g on b.location_area=g.id
|
|
|
+ left join user_archives ua on a.id=ua.uid
|
|
|
<if test="type==1">
|
|
|
inner join (SELECT b.uid
|
|
|
from public_release a left join public_release_details b on a.id=b.prid
|