Merge remote-tracking branch 'origin/master'

This commit is contained in:
cuibaocheng 2020-07-02 18:56:46 +08:00
commit cd4eafccb2

View File

@ -354,7 +354,7 @@
LEFT JOIN
gen_news_directories t2
ON
t1.news_directories_id = t2.news_directories_id
t1.news_directories_id = t2.news_directories_id AND t2.is_delete = 0
WHERE
t1.is_delete = 0
<if test="newsDirectoriesId != null and newsDirectoriesId != ''">