|
@@ -51,6 +51,9 @@
|
|
union
|
|
union
|
|
<include refid="Base_Column_List" /> join t_school_role tsr on tsr.role_id = t.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'
|
|
where t.default_role = 1 and t.type <![CDATA[ <> ]]> 'ADMIN'
|
|
|
|
+ <if test="schoolId != null and schoolId != ''">
|
|
|
|
+ and tsr.school_id = #{schoolId}
|
|
|
|
+ </if>
|
|
<if test="name != null and name != ''">
|
|
<if test="name != null and name != ''">
|
|
and t.name like concat('%', #{name}, '%')
|
|
and t.name like concat('%', #{name}, '%')
|
|
</if>
|
|
</if>
|