lin
2024-03-11 60ea3cbbef6677203c79a4a205bf34c1cdf38594
邮件发送记录优化
4 files modified
20 ■■■■ changed files
src/main/java/org/springblade/modules/email/entity/EmailTemplateEntity.java 4 ●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/email/mapper/EmailTemplateMapper.xml 6 ●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/smsTemplate/entity/SmsTemplateEntity.java 4 ●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/smsTemplate/mapper/SmsTemplateMapper.xml 6 ●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/email/entity/EmailTemplateEntity.java
@@ -69,8 +69,8 @@
    /** 是否已删除 */
    @ApiModelProperty(value = "是否已删除", example = "")
    @TableField("is_delete")
    private Integer isDelete;
    @TableField("is_deleted")
    private Integer isDeleted;
    /** 创建人 */
    @ApiModelProperty(value = "创建人", example = "")
src/main/java/org/springblade/modules/email/mapper/EmailTemplateMapper.xml
@@ -17,7 +17,7 @@
        <result property="content"    column="content"    />
        <result property="createTime"    column="create_time"    />
        <result property="updateTime"    column="update_time"    />
        <result property="isDelete"    column="is_delete"    />
        <result property="isDeleted"    column="is_deleted"    />
        <result property="createBy"    column="create_by"    />
    </resultMap>
@@ -28,7 +28,7 @@
            content,
            create_time,
            update_time,
            is_delete,
            is_deleted,
            create_by
        from
            blade_email_template
@@ -48,7 +48,7 @@
            <if test="content != null  and content != ''"> and content = #{content}</if>
            <if test="createTime != null "> and create_time = #{createTime}</if>
            <if test="updateTime != null "> and update_time = #{updateTime}</if>
            <if test="isDelete != null "> and is_delete = #{isDelete}</if>
            <if test="isDeleted != null "> and is_deleted = #{isDeleted}</if>
            <if test="createBy != null "> and create_by = #{createBy}</if>
        </where>
    </select>
src/main/java/org/springblade/modules/smsTemplate/entity/SmsTemplateEntity.java
@@ -94,6 +94,6 @@
     * 0:否 1:是
     */
    @ApiModelProperty(value = "0:否 1:是", example = "")
    @TableField("is_delete")
    private String isDelete;
    @TableField("is_deleted")
    private String isDeleted;
}
src/main/java/org/springblade/modules/smsTemplate/mapper/SmsTemplateMapper.xml
@@ -20,7 +20,7 @@
        <result property="createTime"    column="create_time"    />
        <result property="updateTime"    column="update_time"    />
        <result property="createBy"    column="create_by"    />
        <result property="isDelete"    column="is_delete"    />
        <result property="isDeleted"    column="is_deleted"    />
    </resultMap>
    <sql id="selectBladeSmsTemplate">
@@ -31,7 +31,7 @@
            create_time,
            update_time,
            create_by,
            is_delete
            is_deleted
        from
            blade_sms_template
    </sql>
@@ -51,7 +51,7 @@
            <if test="createTime != null "> and create_time = #{createTime}</if>
            <if test="updateTime != null "> and update_time = #{updateTime}</if>
            <if test="createBy != null "> and create_by = #{createBy}</if>
            <if test="isDelete != null  and isDelete != ''"> and is_delete = #{isDelete}</if>
            <if test="isDeleted != null  and isDeleted != ''"> and is_deleted = #{isDeleted}</if>
        </where>
    </select>