feat: 模版配置增加公司ID

service-base/src/main/java/com/simuwang/base/pojo/dos/EmailTemplateMappingDO.java

@@ -32,6 +32,11 @@ public class EmailTemplateMappingDO {
     @TableId(value = "email")
     private String email;
     /**
+     * 公司ID
+     */
+    @TableId(value = "company_id")
+    private String companyId;
+    /**
      * 公司名称
      */
     @TableId(value = "company_name")
@@ -86,6 +91,7 @@ public class EmailTemplateMappingDO {
         vo.setTemplateName(this.templateName);
         vo.setStatus(this.status);
         vo.setEmail(this.email);
+        vo.setCompanyId(this.companyId);
         return vo;
     }
 }

service-base/src/main/java/com/simuwang/base/pojo/vo/EmailTemplateMappingVO.java

@@ -30,6 +30,10 @@ public class EmailTemplateMappingVO {
      */
     private String email;
     /**
+     * 公司ID
+     */
+    private String companyId;
+    /**
      * 公司名称
      */
     private String companyName;

service-base/src/main/resources/mapper/EmailTemplateMappingMapper.xml

@@ -7,6 +7,7 @@
         <result column="title" property="title"/>
         <result column="email" property="email"/>
         <result column="company_name" property="companyName"/>
+        <result column="company_id" property="companyId"/>
         <result column="status" property="status"/>
         <result column="isvalid" property="isvalid"/>
         <result column="creatorid" property="creatorId"/>
@@ -16,9 +17,9 @@
         <result column="template_name" property="templateName"/>
     </resultMap>
     <insert id="saveEmailTemplateMappingDO">
-        insert into PPW_EMAIL.email_template_mapping(template_id,title,email,company_name,status,isvalid,creatorid,createtime,updaterid,updatetime)
+        insert into PPW_EMAIL.email_template_mapping(template_id,title,email,company_name,company_id,status,isvalid,creatorid,createtime,updaterid,updatetime)
         values
-            (#{templateId},#{title},#{email},#{companyName},#{status},#{isvalid},#{creatorId},#{createTime},#{updaterId},#{updateTime})
+            (#{templateId},#{title},#{email},#{companyName},#{companyId},#{status},#{isvalid},#{creatorId},#{createTime},#{updaterId},#{updateTime})
     </insert>
     <update id="deleteTemplateSetting">
         update  PPW_EMAIL.email_template_mapping set isvalid=0,updatetime=sysdate(),updaterid=#{userId}
@@ -28,7 +29,7 @@
         </foreach>
     </update>
     <update id="updateEmailTemplateMappingDO">
-        update PPW_EMAIL.email_template_mapping set template_id=#{templateId},title=#{title},email=#{email},company_name=#{companyName},
+        update PPW_EMAIL.email_template_mapping set template_id=#{templateId},title=#{title},email=#{email},company_name=#{companyName},company_id=#{companyId},
                                                     status=#{status},updatetime=#{updateTime},updaterid=#{updaterId}
         where isvalid=1 and id=#{id}
     </update>
@@ -47,7 +48,7 @@
           and t2.status = 1
     </select>
     <select id="searchTemplateSettingList" resultMap="BaseResultMap">
-        select mapping.id,mapping.template_id,mapping.title,mapping.email,mapping.company_name,mapping.status,
+        select mapping.id,mapping.template_id,mapping.title,mapping.email,mapping.company_name,mapping.company_id,mapping.status,
         t.name as template_name
         from PPW_EMAIL.email_template_mapping mapping
             join PPW_EMAIL.email_template_info t on t.id = mapping.template_id and t.isvalid = 1 and t.status = 1
@@ -91,7 +92,7 @@
         </if>
     </select>
     <select id="searchTemplateById" resultMap="BaseResultMap">
-        select mapping.id,mapping.template_id,mapping.title,mapping.email,mapping.company_name,mapping.status,
+        select mapping.id,mapping.template_id,mapping.title,mapping.email,mapping.company_name,mapping.company_id,mapping.status,
                t.name as template_name
         from PPW_EMAIL.email_template_mapping mapping
                  join PPW_EMAIL.email_template_info t on t.id = mapping.template_id and t.isvalid = 1 and t.status = 1