|
|
@@ -387,7 +387,7 @@
|
|
|
</select>
|
|
|
<!--*************************************************************************-->
|
|
|
<select id= "selectAdminListByPage" parameterType="java.lang.String" resultType="com.goafanti.admin.bo.AdminListBo" >
|
|
|
- select
|
|
|
+ select x.*,y.name as departmentName from(select
|
|
|
a.user_no as userNo, a.mobile, a.name,
|
|
|
a.position, a.email, a.id,
|
|
|
a.province,
|
|
|
@@ -396,12 +396,10 @@
|
|
|
aa.name as superior,
|
|
|
a.superior_id as superiorId,
|
|
|
a.department_id as departmentId,
|
|
|
- dm.name as departmentName,
|
|
|
a.duty,a.status
|
|
|
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 department_management dm on a.department_id = dm.id
|
|
|
left join user_role ur on a.id=ur.uid
|
|
|
where a.id <![CDATA[ <> ]]> '1'
|
|
|
and (a.status !='注销' or a.status is null)
|
|
|
@@ -430,7 +428,7 @@
|
|
|
and a.superior_id = #{superiorId,jdbcType=VARCHAR}
|
|
|
</if>
|
|
|
group by a.id
|
|
|
- order by a.number
|
|
|
+ order by a.number )x left join department_management y on x.departmentId = y.id
|
|
|
<if test="page_sql!=null">
|
|
|
${page_sql}
|
|
|
</if>
|