|
@@ -854,7 +854,7 @@
|
|
|
LEFT JOIN sys_role t4 ON t3.role_id = t4.id
|
|
LEFT JOIN sys_role t4 ON t3.role_id = t4.id
|
|
|
AND sd.del_flag = '0'
|
|
AND sd.del_flag = '0'
|
|
|
WHERE
|
|
WHERE
|
|
|
- su.status != 0 AND su.id LIKE '%M%'
|
|
|
|
|
|
|
+ su.status != 0 AND su.id LIKE '%M%' and su.id!='admin'
|
|
|
<if test='user !=null '>
|
|
<if test='user !=null '>
|
|
|
<if test='user.name !=null and user.name!="" '>
|
|
<if test='user.name !=null and user.name!="" '>
|
|
|
and su.name = #{user.name}
|
|
and su.name = #{user.name}
|
|
@@ -888,7 +888,6 @@
|
|
|
WHERE
|
|
WHERE
|
|
|
t1.`status` = 1
|
|
t1.`status` = 1
|
|
|
AND t1.id NOT LIKE '%M%'
|
|
AND t1.id NOT LIKE '%M%'
|
|
|
- and su.id!='admin'
|
|
|
|
|
<if test='user !=null '>
|
|
<if test='user !=null '>
|
|
|
<if test='user.name !=null and user.name!="" '>
|
|
<if test='user.name !=null and user.name!="" '>
|
|
|
and t1.name = #{user.name}
|
|
and t1.name = #{user.name}
|