Merge remote-tracking branch 'origin/master'

liusheng

2 天以前 da026a34bcc97b2eb49607a3b02d94d8f683f997

 smartor/src/main/resources/mapper/smartor/IvrLibaTargetAssortMapper.xml

@@ -24,13 +24,13 @@
    <select id="selectIvrLibaTargetAssortList" parameterType="com.smartor.domain.IvrLibaTargetAssort"
            resultMap="IvrLibaTargetAssortResult">
        <include refid="selectIvrLibaTargetAssortVo"/>
        <where>
        where 1=1
            <if test="indexAssortName != null  and indexAssortName != ''">and index_assort_name like concat('%',
                #{indexAssortName}, '%')
            </if>
            <if test="pid != null ">and pid = #{pid}</if>
            <if test="orgid != null  and orgid != ''">and orgid = #{orgid}</if>
            and del_flag=0
        </where>
        order by seqno asc
    </select>