Merge remote-tracking branch 'origin/master'

This commit is contained in:
LiuY 2022-04-29 11:23:29 +08:00
commit 53c474f14c

View File

@ -120,17 +120,15 @@
FROM FROM
oa_mail_inbox oa_mail_inbox
WHERE WHERE
(
FIND_IN_SET(#{userId}, recipient_ids) FIND_IN_SET(#{userId}, recipient_ids)
OR OR
FIND_IN_SET(#{userId}, copy_for_ids) FIND_IN_SET(#{userId}, copy_for_ids)
OR OR
FIND_IN_SET(#{userId}, secret_ids) FIND_IN_SET(#{userId}, secret_ids)
<if test="keywords != null and keywords != ''">
AND (
recipient_names like CONCAT('%', CONCAT(#{keywords}, '%'))
OR
title like CONCAT('%', CONCAT(#{keywords}, '%'))
) )
<if test="keywords != null and keywords != ''">
AND title like CONCAT('%', CONCAT(#{keywords}, '%'))
</if> </if>
ORDER BY gmt_create DESC ORDER BY gmt_create DESC
</select> </select>