Merge remote-tracking branch 'origin/master'

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

View File

@ -115,22 +115,20 @@
<!-- 收件箱列表 --> <!-- 收件箱列表 -->
<select id="listInboxMail" parameterType="map" resultMap="mailInboxDTO"> <select id="listInboxMail" parameterType="map" resultMap="mailInboxDTO">
SELECT SELECT
id, mail_id_link, recipient_ids, recipient_names, copy_for_ids, copy_for_names, secret_ids, secret_names, id, mail_id_link, recipient_ids, recipient_names, copy_for_ids, copy_for_names, secret_ids, secret_names,
title, mail_files, content_rich, content, creator, gmt_create title, mail_files, content_rich, content, creator, gmt_create
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 != ''"> <if test="keywords != null and keywords != ''">
AND ( AND title like CONCAT('%', CONCAT(#{keywords}, '%'))
recipient_names like CONCAT('%', CONCAT(#{keywords}, '%'))
OR
title like CONCAT('%', CONCAT(#{keywords}, '%'))
)
</if> </if>
ORDER BY gmt_create DESC ORDER BY gmt_create DESC
</select> </select>