|
@@ -1502,7 +1502,7 @@
|
|
|
FROM
|
|
FROM
|
|
|
sys_user su
|
|
sys_user su
|
|
|
LEFT JOIN sys_dept sd ON sd.id = su.dept_id
|
|
LEFT JOIN sys_dept sd ON sd.id = su.dept_id
|
|
|
- LEFT JOIN inf on su.head_sculpture =inf.id
|
|
|
|
|
|
|
+ LEFT JOIN ins_upload_files inf on su.head_sculpture =inf.id
|
|
|
LEFT JOIN sys_user_role sur ON sur.user_id = su.id
|
|
LEFT JOIN sys_user_role sur ON sur.user_id = su.id
|
|
|
<where>
|
|
<where>
|
|
|
<if test="vo.ids != null and vo.ids.size()>0 ">
|
|
<if test="vo.ids != null and vo.ids.size()>0 ">
|
|
@@ -1551,11 +1551,13 @@
|
|
|
</if>
|
|
</if>
|
|
|
<choose>
|
|
<choose>
|
|
|
<when test="pid !=null and pid !=''">
|
|
<when test="pid !=null and pid !=''">
|
|
|
- and eur.level != '1'
|
|
|
|
|
|
|
+ and eur.id != eur.referrer_id
|
|
|
and eur.referrer_id =#{pid}
|
|
and eur.referrer_id =#{pid}
|
|
|
</when>
|
|
</when>
|
|
|
|
|
+
|
|
|
<when test='pid == null'>
|
|
<when test='pid == null'>
|
|
|
- and eur.level = '1'
|
|
|
|
|
|
|
+ and eur.id =eur.referrer_id
|
|
|
|
|
+ and (eur.level = '1' or eur.level ='0')
|
|
|
</when>
|
|
</when>
|
|
|
</choose>
|
|
</choose>
|
|
|
</select>
|
|
</select>
|
