Merge remote-tracking branch 'origin/dev_New' into dev_New

maven

7 天以前 ec3b3bfe38bbde2aecea411c70e1bc868324d9be

 src/main/resources/mapper/approve/ApproveProcessMapper.xml

@@ -32,8 +32,11 @@
        <if test="req.approveId != null and req.approveId != ''">
            and approve_id like concat('%',#{req.approveId},'%')
        </if>
        <if test="req.approveStatus != null and req.approveStatus != ''">
        <if test="req.approveStatus != null or req.approveStatus == 0">
            and approve_status = #{req.approveStatus}
        </if>
        <if test="req.approveType != null ">
            and approve_type = #{req.approveType}
        </if>
    </select>
</mapper>