diff --git a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/mapper/InformationDao.xml b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/mapper/InformationDao.xml index 657c863a9..f01290303 100644 --- a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/mapper/InformationDao.xml +++ b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/mapper/InformationDao.xml @@ -21,6 +21,7 @@ WHERE im.USER_ID = #{userId} AND im.CREATED_TIME <= STR_TO_DATE( #{timestamp}, '%Y-%m-%d %H:%i:%s' ) + AND im.DEL_FLAG= '0' ORDER BY im.READ_FLAG DESC, im.CREATED_TIME DESC LIMIT #{pageIndex},#{pageSize} @@ -34,7 +35,7 @@ (SELECT count(*) FROM epdc_information ii WHERE ii.READ_FLAG = '0' AND ii.USER_ID = #{userId}) amount FROM epdc_information i - WHERE i.USER_ID = #{userId} and i.del_flag = '0' + WHERE i.USER_ID = #{userId} and i.DEL_FLAG = '0' ORDER BY i.CREATED_TIME DESC LIMIT 1 diff --git a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/mapper/NewsCategoryDao.xml b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/mapper/NewsCategoryDao.xml index 646c16cf4..c1c609f44 100644 --- a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/mapper/NewsCategoryDao.xml +++ b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/mapper/NewsCategoryDao.xml @@ -26,6 +26,7 @@ AND id != #{id} + AND DEL_FLAG= '0'