From 6a2b72f043dbef0def2d29c1b7ca7cbfa689415d Mon Sep 17 00:00:00 2001
From: yujt <work@yujt.net.cn>
Date: Fri, 29 May 2020 14:44:17 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=B0=91=E8=AD=A6=E6=97=B6?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/mapper/police/PoliceDao.xml     | 66 +++++--------------
 1 file changed, 18 insertions(+), 48 deletions(-)

diff --git a/epdc-cloud-property/src/main/resources/mapper/police/PoliceDao.xml b/epdc-cloud-property/src/main/resources/mapper/police/PoliceDao.xml
index 56837c7..943ec93 100644
--- a/epdc-cloud-property/src/main/resources/mapper/police/PoliceDao.xml
+++ b/epdc-cloud-property/src/main/resources/mapper/police/PoliceDao.xml
@@ -50,56 +50,25 @@
     </select>
     <select id="selectPoliceGroupInfo" resultType="com.elink.esua.epdc.dto.police.result.PoliceResultDTO">
         SELECT
-        eg.id AS GROUP_ID,
-        eg.GROUP_NAME,
-        eg.GROUP_AVATAR,
-        SUM(
-        CASE
-        WHEN eu.STATE = '10' THEN
-        1
-        ELSE
-        0
-        END
-        ) AS NUMBER_GROUP_MEMBER,
-        SUM(
-        CASE
-        WHEN eu.PARTY_MEMBER = '1'
-        AND eu.STATE = '10' THEN
-        1
-        ELSE
-        0
-        END
-        ) AS NUMBER_GROUP_PARTY_MEMBER,
-        SUM(
-        CASE
-        WHEN eu.USER_ID = #{userId}
-        AND eu.STATE = '0' THEN
-        1
-        WHEN eu.USER_ID = #{userId}
-        AND eu.STATE = '10' THEN
-        2
-        ELSE
-        0
-        END
-        ) AS GROUP_MEMBER_FLAG,
-        eg.STATE AS GROUP_STATE
+            eg.id AS GROUP_ID,
+            eg.GROUP_NAME,
+            eg.GROUP_AVATAR,
+            SUM( CASE WHEN eu.STATE = '10' THEN 1 ELSE 0 END ) AS NUMBER_GROUP_MEMBER,
+            SUM( CASE WHEN eu.PARTY_MEMBER = '1' AND eu.STATE = '10' THEN 1 ELSE 0 END ) AS NUMBER_GROUP_PARTY_MEMBER,
+            SUM( CASE WHEN eu.USER_ID = #{userId} AND eu.STATE = '0' THEN 1 WHEN eu.USER_ID = #{userId} AND eu.STATE = '10' THEN 2 ELSE 0 END ) AS GROUP_MEMBER_FLAG,
+            eg.STATE AS GROUP_STATE
         FROM
-        epdc_group eg
-        LEFT JOIN epdc_user_group eu ON eg.id = eu.GROUP_ID
-        AND eu.DEL_FLAG = '0'
+            epdc_group eg
+            LEFT JOIN epdc_user_group eu ON eg.id = eu.GROUP_ID AND eu.DEL_FLAG = '0'
         WHERE
-        eg.DEL_FLAG = '0'
-        AND eg.GROUP_CATEGORY = '3'
-        AND (
-        eg.STATE = '10'
-        OR eg.STATE = '15'
-        )
-        <if test="gridId != null and gridId != ''">
-            AND (eg.GRID_ID = #{gridId}
-            OR find_in_set(#{gridId},eg.ALL_DEPT_IDS))
-        </if>
-        GROUP BY
-        eg.ID
+            eg.DEL_FLAG = '0'
+            AND eg.GROUP_CATEGORY = '3'
+            AND ( eg.STATE = '10' OR eg.STATE = '15' )
+            <if test="gridId != null and gridId != ''">
+                AND (eg.GRID_ID = #{gridId}
+                OR find_in_set(#{gridId},eg.ALL_DEPT_IDS))
+            </if>
+        GROUP BY eg.ID
     </select>
 
     <select id="selectPoliceInfo" resultType="com.elink.esua.epdc.dto.police.result.PoliceInfoResultDTO">
@@ -115,6 +84,7 @@
         <if test="parentDeptIds != null and parentDeptIds != ''">
             AND ALL_DEPT_IDS = #{parentDeptIds}
         </if>
+        order by UPDATED_TIME desc
     </select>
     <select id="selectListOfOrganizationInfo" resultType="com.elink.esua.epdc.dto.police.PoliceDTO">
         SELECT