push

yd-email-feign/src/main/java/com/yd/email/feign/response/ApiEmailVariableGroupPageResponse.java

@@ -3,6 +3,7 @@ package com.yd.email.feign.response;
 import lombok.Data;
 
 import java.time.LocalDateTime;
+import java.util.List;
 
 @Data
 public class ApiEmailVariableGroupPageResponse {
@@ -33,7 +34,7 @@ public class ApiEmailVariableGroupPageResponse {
     private LocalDateTime createTime;
 
     /**
-     * 变量字段名称英文名数组，多个分号分隔
+     * 变量字段名称英文名数组
      */
-    private String variableNameEns;
+    private List<String> variableNameEnList;
 }

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

@@ -2,7 +2,19 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yd.email.service.dao.EmailVariableGroupMapper">
 
-    <select id="page" resultType="com.yd.email.feign.response.ApiEmailVariableGroupPageResponse">
+    <resultMap id="ApiEmailVariableGroupPageResponseMap" type="com.yd.email.feign.response.ApiEmailVariableGroupPageResponse">
+        <id property="id" column="id"/>
+        <result property="variableGroupBizId" column="variable_group_biz_id"/>
+        <result property="groupName" column="group_name"/>
+        <result property="description" column="description"/>
+        <result property="groupName" column="group_name"/>
+        <result property="createTime" column="create_time"/>
+        <!-- 使用类型处理器 -->
+        <result property="variableNameEnList" column="variableNameEns"
+                typeHandler="com.yd.email.service.handler.StringToListTypeHandler"/>
+    </resultMap>
+
+    <select id="page" resultMap="ApiEmailVariableGroupPageResponseMap">
         select
         evg.*,
         GROUP_CONCAT(ev.variable_name_en SEPARATOR ';') as variableNameEns