Merge branch 'test-xq2' into test

src/main/resources/mapper/modules/admin/SysUserMapper.xml

@@ -305,7 +305,7 @@
         LEFT JOIN sys_role t4 ON t3.role_id = t4.id
         AND sd.del_flag = '0'
         WHERE
-        1=1
+        1=1 AND su.type != 4
         <if test='user !=null  '>
             <if test='user.status !=null and user.status!="" '>
                 and su.status = #{user.status}