|
|
@@ -486,13 +486,14 @@
|
|
|
<!--*************************************************************************-->
|
|
|
<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.superior_id as superiorId, a.department_id as departmentId, a.last_login_time as lastLoginTime, a.contact_mobile as contactMobile,st.name teamName,a.team_id teamId,
|
|
|
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
|
|
|
left join amb_system ambs on a.amb_id=ambs.id
|
|
|
left join department dep on a.department_id = dep.id
|
|
|
+ left join sales_team st on a.team_id=st.id
|
|
|
<if test="rid != null">
|
|
|
RIGHT join (select uid from user_role where rid=#{rid,jdbcType=VARCHAR}) ur on a.id=ur.uid
|
|
|
</if>
|
|
|
@@ -634,9 +635,10 @@
|
|
|
a.department_id as departmentId, a.status,a.user_no as userNo,a.duty,a.district,a.expense_super_examine expenseSuperExamine,
|
|
|
a.head_portrait_url as headPortraitUrl, a.contact_mobile as contactMobile,a.senior_staff seniorStaff,
|
|
|
b.name superior,c.name reviewerName,a.type,a.amb_id ambId,a.manager_id managerId ,d.name managerName,
|
|
|
- a.public_carbon_copy publicCarbonCopy,e.name publicCarbonCopyName
|
|
|
+ a.public_carbon_copy publicCarbonCopy,e.name publicCarbonCopyName,a.team_id teamId,st.name teamName
|
|
|
from admin a left join admin b on a.superior_id =b.id left join admin c on a.reviewer =c.id
|
|
|
left join admin d on a.manager_id=d.id left join admin e on a.public_carbon_copy=e.id
|
|
|
+ left join sales_team st on a.team_id=st.id
|
|
|
where a.id= #{id,jdbcType=VARCHAR}
|
|
|
</select>
|
|
|
<select id="selectNameByid" parameterType="java.lang.String" resultType="java.lang.String">
|