Merge remote-tracking branch 'origin/master'

src/main/resources/mapper/sys/SysMenuDao.xml

@@ -103,7 +103,11 @@
     </select>
 
     <select id="checkSuperAdmin" resultType="com.spring.modules.sys.entity.SysRoleEntity">
-        select user_id,role_id from sys_user_role where role_id = 1 and user_id=#{userId}
+        select
+        sur.user_id,
+        sur.role_id from sys_user_role sur
+        left join sys_role sr on sur.role_id = sr.role_id
+        where sr.super_flag = 'Y' and sur.user_id=#{userId}
 </select>
 
     <select id="getUserRoleHasSuperFlag" resultType="com.spring.modules.sys.entity.SysRoleEntity">