修复

yd-email-feign/src/main/java/com/yd/email/feign/request/ApiEmailContactPageRequest.java

@@ -23,4 +23,9 @@ public class ApiEmailContactPageRequest extends PageDto {
      * 联系人邮箱
      * 联系人邮箱
      */
      */
     private String email;
     private String email;
+
+    /**
+     * 查询内容（模糊搜索：公司名称/联系人姓名/联系人邮箱）
+     */
+    private String queryContent;
 }
 }

yd-email-feign/src/main/java/com/yd/email/feign/request/ApiEmailVariablePageRequest.java

@@ -16,4 +16,9 @@ public class ApiEmailVariablePageRequest extends PageDto {
      */
      */
     private String variableNameEn;
     private String variableNameEn;
 
 
+    /**
+     * 查询内容（模糊搜索：变量字段名称中文名/变量字段名称英文名）
+     */
+    private String queryContent;
+
 }
 }

yd-email-service/src/main/resources/mappers/EmailContactMapper.xml

@@ -39,6 +39,10 @@
                 and ec.email like concat('%', #{request.email}, '%')
                 and ec.email like concat('%', #{request.email}, '%')
             </if>
             </if>
 
 
+            <if test="request.queryContent != null and request.queryContent != ''">
+                and (ec.company_name like concat('%', #{request.companyName}, '%') or ec.name like concat('%', #{request.queryContent}, '%') or ec.email like concat('%', #{request.queryContent}, '%'))
+            </if>
+
             and ec.is_deleted = 0
             and ec.is_deleted = 0
         </where>
         </where>
         group by ec.id
         group by ec.id

yd-email-service/src/main/resources/mappers/EmailVariableMapper.xml

@@ -14,6 +14,10 @@
                 and ev.variable_name_en like concat('%', #{request.variableNameEn}, '%')
                 and ev.variable_name_en like concat('%', #{request.variableNameEn}, '%')
             </if>
             </if>
 
 
+            <if test="request.queryContent != null and request.queryContent != ''">
+                and (ev.variable_name_en like concat('%', #{request.queryContent}, '%') or ev.variable_name_cn like concat('%', #{request.queryContent}, '%'))
+            </if>
+
             and ev.is_deleted = 0
             and ev.is_deleted = 0
         </where>
         </where>
     </select>
     </select>