Merge remote-tracking branch 'origin/master'

src/main/resources/mybatis/mapper/mail/mail-mapper.xml

@@ -120,17 +120,15 @@
         FROM
         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}, '%'))
         )
+        <if test="keywords != null and keywords != ''">
+        AND title like  CONCAT('%', CONCAT(#{keywords}, '%'))
         </if>
         ORDER BY gmt_create DESC
     </select>