Merge remote-tracking branch 'origin/master'

于紫祥_1901

2020-12-23 e745dd38c5a413eaa000c7c5434621fbcd1800d5

 src/main/resources/mapper/RoleMapper.xml

@@ -49,16 +49,6 @@
        </where>
    </sql>

    <select id="getRoleListByName" resultMap="BaseResultMap">
        select
        <include refid="Base_Column_List"/>
        from role
        where is_delete=0
        <if test="roleName != 'null'">
            and role_name like concat('%',#{roleName},'%')
        </if>
    </select>

    <select id="getRoleList" resultMap="BaseResultMap">
        select
        <include refid="Base_Column_List"/>
@@ -70,39 +60,5 @@
            order by ${orderByClause}
        </if>
    </select>

    <update id="updateByPrimaryKey" parameterType="com.moral.entity.Role" >
        update role
        <set >
            <if test="roleCode != null" >
                role_code = #{roleCode,jdbcType=VARCHAR},
            </if>
            <if test="roleName != null" >
                role_name = #{roleName,jdbcType=VARCHAR},
            </if>
            <if test="channelId != null" >
                channel_id = #{channelId,jdbcType=INTEGER},
            </if>
            <if test="isDelete != null" >
                is_delete = #{isDelete,jdbcType=CHAR},
            </if>
            <if test="roleRemark != null" >
                role_remark = #{roleRemark,jdbcType=VARCHAR},
            </if>
            <if test="createTime != null" >
                create_time = #{createTime,jdbcType=TIMESTAMP},
            </if>
            <if test="createUser != null" >
                create_user = #{createUser,jdbcType=VARCHAR},
            </if>
            <if test="updateTime != null" >
                update_time = #{updateTime,jdbcType=TIMESTAMP},
            </if>
            <if test="updateUser != null" >
                update_user = #{updateUser,jdbcType=VARCHAR},
            </if>
        </set>
        where id = #{id,jdbcType=INTEGER}
    </update>

</mapper>