From 76a297e7811adbd6d797949c9da3f03f28121c10 Mon Sep 17 00:00:00 2001
From: yujintao <yujintaodotcn@foxmail.com>
Date: Thu, 13 Feb 2020 09:49:15 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=B2=E5=BC=80=E9=80=9A=E7=BD=91=E6=A0=BC?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8sql=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/mapper/user/UserAnalysisDao.xml | 39 ++++++++-----------
 1 file changed, 17 insertions(+), 22 deletions(-)

diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/user/UserAnalysisDao.xml b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/user/UserAnalysisDao.xml
index 1c58a8f7a..804ce8287 100644
--- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/user/UserAnalysisDao.xml
+++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/user/UserAnalysisDao.xml
@@ -339,30 +339,25 @@
 
     <select id="selectListGridHasMaCode" resultType="com.elink.esua.epdc.dto.user.result.GridOpeningResultDTO">
         SELECT
-        ad.id gridId,
-        CONCAT( ad2.`name`, '-', ad1.`name`, '-', ad.`name` ) AS allDeptName,
-        GROUP_CONCAT( DISTINCT u.real_name ) gridLeader
+            ad.id gridId,
+            CONCAT( ad2.`name`, '-', ad1.`name`, '-', ad.`name` ) AS allDeptName,
+            GROUP_CONCAT( DISTINCT u.real_name ) gridLeader
         FROM
-        esua_epdc_admin.sys_dept ad
-        LEFT JOIN esua_epdc_admin.epdc_dept_ma_code ama ON ad.id = ama.GRID_ID AND ama.DEL_FLAG = '0'
-        LEFT JOIN esua_epdc_admin.sys_dept ad1 ON ad1.id = ad.pid
-        LEFT JOIN esua_epdc_admin.sys_dept ad2 ON ad2.id = ad1.pid
-        LEFT JOIN esua_epdc_admin.sys_role_data_scope ards ON ards.dept_id = ad.id
-        LEFT JOIN esua_epdc_admin.sys_role r ON ards.role_id = r.id AND r.DEL_FLAG = 0 and r.type_key = 'gridLeader'
-        LEFT JOIN esua_epdc_admin.sys_role_user ru ON r.id = ru.role_id
-        LEFT JOIN esua_epdc_admin.sys_user u ON ru.user_id = u.id AND u.del_flag = 0
+            esua_epdc_admin.sys_dept ad
+            LEFT JOIN esua_epdc_admin.epdc_dept_ma_code ama ON ad.id = ama.GRID_ID AND ama.DEL_FLAG = '0'
+            LEFT JOIN esua_epdc_admin.sys_dept ad1 ON ad1.id = ad.pid
+            LEFT JOIN esua_epdc_admin.sys_dept ad2 ON ad2.id = ad1.pid
+            LEFT JOIN esua_epdc_admin.sys_role_data_scope ards ON ards.dept_id = ad.id
+            LEFT JOIN esua_epdc_admin.sys_role r ON ards.role_id = r.id AND r.DEL_FLAG = 0 and r.type_key = 'gridLeader'
+            LEFT JOIN esua_epdc_admin.sys_role_user ru ON r.id = ru.role_id
+            LEFT JOIN esua_epdc_admin.sys_user u ON ru.user_id = u.id AND u.del_flag = 0
         WHERE
-        ad.type_key = 'grid_party'
-        AND ad.del_flag = 0
-        AND ama.ID IS
-        <if test='category != null and category == "0"'>NOT</if>
-        NULL
-        <if test="gridId != null and grid != ''">and (ad1.id = #{gridId} or ad2.id = #{gridId})</if>
-        GROUP BY
-        ad.id
-        ORDER BY
-        ama.CREATED_TIME DESC,
-        ad.create_date DESC
+            ad.type_key = 'grid_party'
+            AND ad.del_flag = 0
+            AND ama.ID IS <if test='category != null and category == "1"'>NOT</if> NULL
+            <if test="gridId != null and grid != ''">and (ad1.id = #{gridId} or ad2.id = #{gridId})</if>
+        GROUP BY ad.id
+        ORDER BY ama.CREATED_TIME DESC, ad.create_date DESC
     </select>
     <select id="selectListReigistData" resultType="com.elink.esua.epdc.dto.user.result.GridOpeningResultDTO">
         SELECT