|
@@ -273,14 +273,9 @@
|
|
|
<if test="systemType != 1 and clientType != 3">
|
|
<if test="systemType != 1 and clientType != 3">
|
|
|
and smr.del_flag = 0
|
|
and smr.del_flag = 0
|
|
|
</if>
|
|
</if>
|
|
|
- <choose>
|
|
|
|
|
- <when test="clientType == 3">
|
|
|
|
|
- and sm.client_type = 2
|
|
|
|
|
- </when>
|
|
|
|
|
- <otherwise>
|
|
|
|
|
- and sm.client_type = #{clientType}
|
|
|
|
|
- </otherwise>
|
|
|
|
|
- </choose>
|
|
|
|
|
|
|
+ <if test="clientType != null">
|
|
|
|
|
+ and sm.client_type = #{clientType}
|
|
|
|
|
+ </if>
|
|
|
<if test="name != null and name != ''">
|
|
<if test="name != null and name != ''">
|
|
|
and sm.name = #{name, jdbcType=VARCHAR}
|
|
and sm.name = #{name, jdbcType=VARCHAR}
|
|
|
</if>
|
|
</if>
|
|
@@ -290,11 +285,11 @@
|
|
|
using_roles like concat('%', #{item}, '%')
|
|
using_roles like concat('%', #{item}, '%')
|
|
|
</foreach>
|
|
</foreach>
|
|
|
</if>
|
|
</if>
|
|
|
- <if test="entId != null">
|
|
|
|
|
|
|
+ <if test="entId != null and clientType != 3">
|
|
|
and smr.ent_id = #{entId}
|
|
and smr.ent_id = #{entId}
|
|
|
and smr.role_id is null
|
|
and smr.role_id is null
|
|
|
</if>
|
|
</if>
|
|
|
- <if test="roleIds != null and roleIds.size() > 0">
|
|
|
|
|
|
|
+ <if test="roleIds != null and roleIds.size() > 0 and clientType != 3">
|
|
|
and smr.role_id in
|
|
and smr.role_id in
|
|
|
<foreach collection="roleIds" separator="," open="(" close=")" item="item">
|
|
<foreach collection="roleIds" separator="," open="(" close=")" item="item">
|
|
|
#{item}
|
|
#{item}
|
czh