From 70086a6d766f8383d6a6f4cdfd5a4a9ffb14559a Mon Sep 17 00:00:00 2001
From: yinzuomei <yinzuomei@elink-cn.com>
Date: Mon, 17 Feb 2020 18:36:51 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=80=E6=96=B0=E6=9C=80=E7=83=AD=E8=AE=AE?=
 =?UTF-8?q?=E9=A2=98sql=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/issue/IssueAnalysisDao.xml         | 30 +++++++++----------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/issue/IssueAnalysisDao.xml b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/issue/IssueAnalysisDao.xml
index 5ea1fbccc..4043334ec 100644
--- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/issue/IssueAnalysisDao.xml
+++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/issue/IssueAnalysisDao.xml
@@ -19,6 +19,9 @@
         esua_epdc_events.epdc_issue ei
         LEFT JOIN esua_epdc_events.epdc_events ee ON ee.ID = ei.EVENT_ID
         AND ee.DEL_FLAG = '0'
+        WHERE
+        ei.DEL_FLAG = '0'
+        AND ei.ISSUE_STATE IN ( 0, 2 )
         <if test="issueContent != null and issueContent != ''">
             AND ei.ISSUE_CONTENT LIKE CONCAT('%',#{issueContent},'%')
         </if>
@@ -38,16 +41,13 @@
             and DATE_FORMAT( ei.CREATED_TIME, '%Y-%m-%d' ) &lt;=#{endTime}
         </if>
         <if test="deptIdList!=null and deptIdList.size()>0">
-            and ei.GRID_ID  in
+            and ei.GRID_ID in
             <foreach collection="deptIdList" index="index" item="deptId" open="(" separator="," close=")">
                 #{deptId}
             </foreach>
         </if>
-        WHERE
-            ei.DEL_FLAG = '0'
-            AND ei.ISSUE_STATE IN ( 0, 2 )
         ORDER BY
-            expressAttitudeNum DESC
+        expressAttitudeNum DESC
     </select>
 
     <!--  最新议题列表  -->
@@ -60,13 +60,16 @@
             ei.CREATED_TIME,
             ee.APPROVE_NUM,
             ee.OPPOSE_NUM,
-            ee.COMMENT_NUM,
-            ee.BROWSE_NUM,
-            ( ee.COMMENT_NUM + ee.BROWSE_NUM + ee.APPROVE_NUM + ee.OPPOSE_NUM ) AS expressAttitudeNum
+        ee.COMMENT_NUM,
+        ee.BROWSE_NUM,
+        ( ee.COMMENT_NUM + ee.BROWSE_NUM + ee.APPROVE_NUM + ee.OPPOSE_NUM ) AS expressAttitudeNum
         FROM
-            esua_epdc_events.epdc_issue ei
-            LEFT JOIN esua_epdc_events.epdc_events ee ON ee.ID = ei.EVENT_ID
-            AND ee.DEL_FLAG = '0'
+        esua_epdc_events.epdc_issue ei
+        LEFT JOIN esua_epdc_events.epdc_events ee ON ee.ID = ei.EVENT_ID
+        AND ee.DEL_FLAG = '0'
+        WHERE
+        ei.DEL_FLAG = '0'
+        AND ei.ISSUE_STATE IN ( 0, 2 )
         <if test="issueContent != null and issueContent != ''">
             AND ei.ISSUE_CONTENT LIKE CONCAT('%',#{issueContent},'%')
         </if>
@@ -86,14 +89,11 @@
             and DATE_FORMAT( ei.CREATED_TIME, '%Y-%m-%d' ) &lt;=#{endTime}
         </if>
         <if test="deptIdList!=null and deptIdList.size()>0">
-            and ei.GRID_ID  in
+            and ei.GRID_ID in
             <foreach collection="deptIdList" index="index" item="deptId" open="(" separator="," close=")">
                 #{deptId}
             </foreach>
         </if>
-        WHERE
-        ei.DEL_FLAG = '0'
-        AND ei.ISSUE_STATE IN ( 0, 2 )
         ORDER BY
         expressAttitudeNum DESC,CREATED_TIME desc
     </select>