|
|
@@ -529,7 +529,7 @@
|
|
|
left join admin aa on aa.id = a.superior_id
|
|
|
left join user_role ur on a.id=ur.uid
|
|
|
left join `role` y on ur.rid=y.id
|
|
|
- where a.id <![CDATA[ <> ]]> '1'
|
|
|
+ where a.id <![CDATA[ <> ]]> '1' and a.status='正常'
|
|
|
<if test="roleName != null">
|
|
|
and y.role_name= #{roleName,jdbcType=VARCHAR}
|
|
|
</if>
|
|
|
@@ -568,7 +568,7 @@
|
|
|
from(select a.id counts from (select a.id from admin a
|
|
|
left join user_role ur on a.id=ur.uid
|
|
|
left join `role` y on ur.rid=y.id
|
|
|
- where a.id <![CDATA[ <> ]]> '1'
|
|
|
+ where a.id <![CDATA[ <> ]]> '1' and a.status='正常'
|
|
|
<if test="roleName != null">
|
|
|
and y.role_name= #{roleName,jdbcType=VARCHAR}
|
|
|
</if>
|