|
|
@@ -599,7 +599,7 @@
|
|
|
<select id="selectAdminListByPage" parameterType="java.lang.String" resultType="com.goafanti.admin.bo.AdminListBo">
|
|
|
select a.id, a.mobile, a.name, a.position, a.email, a.province, a.city, a.create_time as createTime, aa.name as superior,dep.name departmentName,
|
|
|
a.superior_id as superiorId, a.department_id as departmentId, a.last_login_time as lastLoginTime, a.contact_mobile as contactMobile,
|
|
|
- a.duty,a.status, a.type, ambs.id ambId,ambs.name ambName,ambs.ancestors_names ancestorsNames ,a.amb_role ambRole,a.senior_staff seniorStaff
|
|
|
+ a.duty,a.status, a.type, ambs.id ambId,ambs.name ambName,ambs.ancestors_names ancestorsNames ,a.amb_role ambRole,a.senior_staff seniorStaff,a.public_purview publicPurview
|
|
|
from admin a
|
|
|
left join admin_location al on a.id = al.admin_id
|
|
|
left join admin aa on aa.id = a.superior_id
|
|
|
@@ -641,6 +641,10 @@
|
|
|
<if test="seniorStaff != null">
|
|
|
and a.senior_staff = #{seniorStaff}
|
|
|
</if>
|
|
|
+ <if test="publicPurview != null">
|
|
|
+ and a.public_purview = #{publicPurview}
|
|
|
+ </if>
|
|
|
+
|
|
|
<if test="ancestors != null">
|
|
|
and (ambs.id=#{ancestors} or find_in_set( #{ancestors} ,ambs.ancestors))
|
|
|
</if>
|
|
|
@@ -694,6 +698,9 @@
|
|
|
<if test="seniorStaff != null">
|
|
|
and a.senior_staff = #{seniorStaff}
|
|
|
</if>
|
|
|
+ <if test="publicPurview != null">
|
|
|
+ and a.public_purview = #{publicPurview}
|
|
|
+ </if>
|
|
|
<if test="ancestors != null">
|
|
|
and (ambs.id=#{ancestors} or find_in_set( #{ancestors} ,ambs.ancestors))
|
|
|
</if>
|