Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
53c474f14c
@ -115,22 +115,20 @@
|
||||
<!-- 收件箱列表 -->
|
||||
<select id="listInboxMail" parameterType="map" resultMap="mailInboxDTO">
|
||||
SELECT
|
||||
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
|
||||
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
|
||||
FROM
|
||||
oa_mail_inbox
|
||||
oa_mail_inbox
|
||||
WHERE
|
||||
(
|
||||
FIND_IN_SET(#{userId}, recipient_ids)
|
||||
OR
|
||||
FIND_IN_SET(#{userId}, copy_for_ids)
|
||||
OR
|
||||
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}, '%'))
|
||||
)
|
||||
AND title like CONCAT('%', CONCAT(#{keywords}, '%'))
|
||||
</if>
|
||||
ORDER BY gmt_create DESC
|
||||
</select>
|
||||
|
Loading…
Reference in New Issue
Block a user