|
@@ -288,9 +288,19 @@
|
|
|
LEFT JOIN `jeecg-boot`.sys_user_role ur ON ur.user_id = u.id
|
|
|
LEFT JOIN `jeecg-boot`.sys_role r ON r.id = ur.role_id
|
|
|
<where>
|
|
|
- <if test="roleName != null and roleName != ''">
|
|
|
- and r.role_name LIKE concat('%',#{roleName},'%') or r.role_code LIKE concat('%',#{roleName},'%')
|
|
|
- </if>
|
|
|
+ <choose>
|
|
|
+ <when test="roleName != null and roleName != ''">
|
|
|
+ and r.role_name LIKE concat('%',#{roleName},'%') or r.role_code LIKE concat('%',#{roleName},'%')
|
|
|
+ </when>
|
|
|
+ <otherwise>
|
|
|
+ and (r.role_name LIKE '%平面组长%'
|
|
|
+ or r.role_name LIKE '%设计组长%'
|
|
|
+ or r.role_name LIKE '%制片%'
|
|
|
+ or r.role_name LIKE '%平面%'
|
|
|
+ or r.role_name LIKE '%策划%'
|
|
|
+ or r.role_name LIKE '%拍摄%')
|
|
|
+ </otherwise>
|
|
|
+ </choose>
|
|
|
</where>
|
|
|
</select>
|
|
|
|