|
@@ -38,9 +38,6 @@
|
|
<if test="journalismName != null and journalismName != ''">and a.Journalism_name like concat('%',
|
|
<if test="journalismName != null and journalismName != ''">and a.Journalism_name like concat('%',
|
|
#{journalismName}, '%')
|
|
#{journalismName}, '%')
|
|
</if>
|
|
</if>
|
|
- <if test="columnName != null and columnName != ''">and b.column_name like concat('%',
|
|
|
|
- #{columnName}, '%')
|
|
|
|
- </if>
|
|
|
|
<if test="columnId != null and columnId != 0">
|
|
<if test="columnId != null and columnId != 0">
|
|
AND (a.column_id = #{columnId} OR a.column_id IN ( SELECT b.column_id FROM zhjq_column b WHERE
|
|
AND (a.column_id = #{columnId} OR a.column_id IN ( SELECT b.column_id FROM zhjq_column b WHERE
|
|
find_in_set(#{columnId},parent_id) ))
|
|
find_in_set(#{columnId},parent_id) ))
|