Merge remote-tracking branch 'origin/master'

mitao

2 天以前 0e6da184ed0a6d511a17e1ed86a470cda71c0f3b

 ruoyi-system/src/main/resources/mapper/system/OaApprovalTodoMapper.xml

@@ -31,5 +31,15 @@
        group by application_id
        order by create_time desc
    </select>
    <select id="pageListAudit" resultType="com.ruoyi.system.model.OaApprovalTodo">
        select * from oa_approval_todo
        where 1=1
        <if test="query.userId != null">
            and user_id = #{query.userId}
        </if>
        and status = 1
        group by application_id
        order by create_time desc
    </select>

</mapper>