From e0156b8b9e9192c2fc3549c9b0c63fd25223fc14 Mon Sep 17 00:00:00 2001
From: qushutong <1976590620@qq.com>
Date: Mon, 23 Sep 2019 15:34:03 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug=20=E6=96=B0=E9=97=BB?=
 =?UTF-8?q?=E7=B1=BB=E5=88=AB=E6=A0=87=E7=AD=BE=E6=9F=A5=E9=87=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/InformationDao.xml               | 3 ++-
 .../src/main/resources/mapper/NewsCategoryDao.xml              | 2 ++
 2 files changed, 4 insertions(+), 1 deletion(-)

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 &lt;= 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
     </select>
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 @@
         <if test="id!=null and id!=''">
             AND id != #{id}
         </if>
+        AND  DEL_FLAG= '0'
     </select>
     <select id="selectNameCount" resultType="int">
     SELECT
@@ -37,6 +38,7 @@
         <if test="id!=null and id!=''">
             AND id != #{id}
         </if>
+        AND  DEL_FLAG= '0'
     </select>
     <select id="selectListCategory" resultType="Map">
         SELECT ID as id,CATEGORY_NAME as name FROM esua_epdc_news.epdc_news_category where DEL_FLAG= '0'