Merge branch 'local_20221014' into huacheng_test

yanghui

2022-10-17 a9a660a85f54911a76aefd1eb29a3af0c7b0e419

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/resources/mapper/SysOperLogDAO.xml

@@ -28,7 +28,13 @@


    <select id="pageOperLog" resultType="com.panzhihua.common.model.vos.user.SysOperLogVO">
        select * from sys_oper_log where 1=1 <if test="sysOperLogVO.communityId != null">and community_id = #{sysOperLogVO.communityId}</if> <if test="sysOperLogVO.areaCode !=null"> and area_code = #{sysOperLogVO.areaCode} </if> order by oper_time desc
        select * from sys_oper_log
        where 1=1
            <if test="sysOperLogVO.communityId != null">and community_id = #{sysOperLogVO.communityId}</if>
            <if test="sysOperLogVO.areaCode !=null"> and area_code = #{sysOperLogVO.areaCode} </if>
            <if test="sysOperLogVO.startTime !=null"> and oper_Time &gt;= #{sysOperLogVO.startTime} </if>
            <if test="sysOperLogVO.endTime !=null"> and oper_Time &lt;= #{sysOperLogVO.endTime} </if>
        order by oper_time desc
    </select>