Merge remote-tracking branch 'origin/master'

CBin

2023-08-02 88b0f7ea048e9b201af0bc390f3da8840b11c899

 ruoyi-modules/ruoyi-system/src/main/resources/mapper/config/CustomConfigMapper.xml

@@ -18,10 +18,26 @@
        oper_ip operIp,
        oper_content operContent
        FROM sys_oper_log
        WHERE operator_type = 1
        WHERE operator_type = 1 AND del_flag = 0
        <if test="param.operContent != null and param.operContent !=''">
            oper_content LIKE concat('%', #{param.operContent}, '%')
        </if>
        <if test="param.operTitle != null and param.operTitle !=''">
            title = #{param.operTitle}
        </if>
        <if test="param.operStartTime!=null and param.operStartTime!=''">
            AND Date(oper_time) &gt;= #{param.operStartTime}
        </if>
        <if test="param.operEndTime!=null and param.operEndTime!=''">
            AND Date(oper_time) &lt;= #{param.operEndTime}
        </if>
        ORDER BY oper_time DESC
    </select>

    <update id="deleteOperlog">
        UPDATE sys_oper_log SET del_flag = 1 WHERE del_flag = 0
    </update>

    <select id="listOperTitle" resultType="java.lang.String">
        SELECT DISTINCT title FROM sys_oper_log
        WHERE operator_type = 1