|
|
@@ -788,17 +788,18 @@
|
|
|
SELECT
|
|
|
u.id as uid, ui.username, u.number,
|
|
|
ui.id as identityId, ui.province,
|
|
|
- info.person_portrait_url as personPortraitUrl,
|
|
|
+ u.head_portrait_url as personPortraitUrl,
|
|
|
adc.achievement_count as achievementNum,
|
|
|
adc.demand_count as demandNum,
|
|
|
uc.engaged_field as engagedField,
|
|
|
uc.work_unit as workUnit,
|
|
|
- uc.position
|
|
|
+ uc.position,
|
|
|
+ ui.international
|
|
|
FROM
|
|
|
<![CDATA[ user ]]> u
|
|
|
LEFT JOIN user_identity ui ON ui.uid = u.id
|
|
|
LEFT JOIN user_career uc ON uc.uid = u.id
|
|
|
- LEFT JOIN user_info info ON info.uid = u.id
|
|
|
+ <!-- LEFT JOIN user_info info ON info.uid = u.id -->
|
|
|
LEFT JOIN achievement_demand_count adc ON adc.uid = u.id
|
|
|
WHERE
|
|
|
u.type = 0 and ui.expert = 1
|
|
|
@@ -808,6 +809,9 @@
|
|
|
<if test="null !=level and level==0">
|
|
|
AND u.lvl = 0
|
|
|
</if>
|
|
|
+ <if test="international !=null">
|
|
|
+ AND ui.international= #{international,jdbcType=INTEGER}
|
|
|
+ </if>
|
|
|
<if test="province != null">
|
|
|
AND ui.province = #{province,jdbcType=INTEGER}
|
|
|
</if>
|
|
|
@@ -845,6 +849,9 @@
|
|
|
<if test="null != level and level==0">
|
|
|
AND u.lvl = 0
|
|
|
</if>
|
|
|
+ <if test="international !=null">
|
|
|
+ AND ui.international= #{international,jdbcType=INTEGER}
|
|
|
+ </if>
|
|
|
<if test="province != null">
|
|
|
AND ui.province = #{province,jdbcType=INTEGER}
|
|
|
</if>
|
|
|
@@ -866,15 +873,15 @@
|
|
|
a.id,
|
|
|
b.username as ownerName,
|
|
|
c.ability_label as abilityLabel,
|
|
|
- d.person_portrait_url personPortraitUrl,
|
|
|
+ a.head_portrait_url personPortraitUrl,
|
|
|
e.education
|
|
|
from user a
|
|
|
left join user_identity b
|
|
|
on a.id = b.uid
|
|
|
left join user_ability c
|
|
|
on a.id = c.uid
|
|
|
- left join user_info d
|
|
|
- on a.id = d.uid
|
|
|
+ <!-- left join user_info d
|
|
|
+ on a.id = d.uid -->
|
|
|
left join user_edu e
|
|
|
on a.id = e.uid
|
|
|
where 1=1
|