|
@@ -683,7 +683,7 @@
|
|
AND s.name LIKE CONCAT('%',#{shopName},'%')
|
|
AND s.name LIKE CONCAT('%',#{shopName},'%')
|
|
</if>
|
|
</if>
|
|
<if test="userName != null and userName != ''">
|
|
<if test="userName != null and userName != ''">
|
|
- AND u.userName LIKE CONCAT('%',#{userName},'%')
|
|
|
|
|
|
+ AND (u.userName LIKE CONCAT('%',#{userName},'%') OR u.name LIKE CONCAT('%',#{userName},'%') OR s.name LIKE CONCAT('%',#{userName},'%'))
|
|
</if>
|
|
</if>
|
|
<if test="confirmedType == 2">
|
|
<if test="confirmedType == 2">
|
|
AND cdr.receiptStatus = 2
|
|
AND cdr.receiptStatus = 2
|