超管设置新增角色配置

teachcloud-common/src/main/resources/mapper/SysRoleMapper.xml

@@ -49,7 +49,7 @@
             </if>
         </where>
         union
-        <include refid="Base_Column_List" /> join t_school_role tsr on tsr.role_id = t.id and tsr.school_id = t.school_id
+        <include refid="Base_Column_List" /> join t_school_role tsr on tsr.role_id = t.id
         where t.default_role = 1 and t.type <![CDATA[ <> ]]> 'ADMIN'
             <if test="name != null and name != ''">
                 and t.name like concat('%', #{name}, '%')
@@ -70,7 +70,7 @@
             </if>
         </where>
         union
-        <include refid="Base_Column_List" /> join t_school_role tsr on tsr.role_id = t.id and tsr.school_id = t.school_id
+        <include refid="Base_Column_List" /> join t_school_role tsr on tsr.role_id = t.id
         where t.default_role = 1 and t.type <![CDATA[ <> ]]> 'ADMIN'
     </select>
 </mapper>