Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
cd4eafccb2
@ -354,7 +354,7 @@
|
|||||||
LEFT JOIN
|
LEFT JOIN
|
||||||
gen_news_directories t2
|
gen_news_directories t2
|
||||||
ON
|
ON
|
||||||
t1.news_directories_id = t2.news_directories_id
|
t1.news_directories_id = t2.news_directories_id AND t2.is_delete = 0
|
||||||
WHERE
|
WHERE
|
||||||
t1.is_delete = 0
|
t1.is_delete = 0
|
||||||
<if test="newsDirectoriesId != null and newsDirectoriesId != ''">
|
<if test="newsDirectoriesId != null and newsDirectoriesId != ''">
|
||||||
|
Loading…
Reference in New Issue
Block a user