Merge remote-tracking branch 'origin/master'

zhongrj

2024-03-11 7f3ee212eb210aba3a7da7d2cb4a8d1af2f56116

Merge remote-tracking branch 'origin/master'

 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

@@ -8,30 +8,38 @@


    <select id="selectEmailTemplatePage" resultMap="emailTemplateResultMap">
        select * from blade_email_template where is_deleted = 0
        select * from blade_email_template
        <where>
            <if test="id != null ">and id = #{id}</if>
            <if test="title != null  and title != ''">and title like CONCAT('%', #{title},'%')</if>
            <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="isDeleted != null ">and is_deleted = #{isDeleted}</if>
            <if test="createBy != null ">and create_by = #{createBy}</if>
            and is_deleted = 0
        </where>
    </select>

    <resultMap type="org.springblade.modules.email.dto.EmailTemplateDTO" id="BladeEmailTemplateDTOResult">
        <result property="id"    column="id"    />
        <result property="title"    column="title"    />
        <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="createBy"    column="create_by"    />
        <result property="id" column="id"/>
        <result property="title" column="title"/>
        <result property="content" column="content"/>
        <result property="createTime" column="create_time"/>
        <result property="updateTime" column="update_time"/>
        <result property="isDeleted" column="is_deleted"/>
        <result property="createBy" column="create_by"/>
    </resultMap>

    <sql id="selectBladeEmailTemplate">
        select
            id,
            title,
            content,
            create_time,
            update_time,
            is_delete,
            create_by
        from
            blade_email_template
        select id,
               title,
               content,
               create_time,
               update_time,
               is_deleted,
               create_by
        from blade_email_template
    </sql>

    <select id="selectBladeEmailTemplateById" parameterType="int" resultMap="BladeEmailTemplateDTOResult">
@@ -40,16 +48,17 @@
        id = #{id}
    </select>

    <select id="selectBladeEmailTemplateList" parameterType="org.springblade.modules.email.dto.EmailTemplateDTO" resultMap="BladeEmailTemplateDTOResult">
    <select id="selectBladeEmailTemplateList" parameterType="org.springblade.modules.email.dto.EmailTemplateDTO"
            resultMap="BladeEmailTemplateDTOResult">
        <include refid="selectBladeEmailTemplate"/>
        <where>
            <if test="id != null "> and id = #{id}</if>
            <if test="title != null  and title != ''"> and title = #{title}</if>
            <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="createBy != null "> and create_by = #{createBy}</if>
            <if test="id != null ">and id = #{id}</if>
            <if test="title != null  and title != ''">and title = #{title}</if>
            <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="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>