From 3d3024c73fc54e0ce9ba0a475add1fd975caf7f4 Mon Sep 17 00:00:00 2001
From: liuchuang <123456>
Date: Tue, 2 Feb 2021 17:40:35 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=B7=A5=E4=BD=9C=E7=AB=AF?=
 =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E5=BE=85=E8=AE=A4=E8=AF=81=E5=B1=85=E6=B0=91?=
 =?UTF-8?q?=E6=95=B0=E9=87=8F=E9=94=99=E8=AF=AF=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/UserDao.xml     | 36 ++++++++++++++++++-
 1 file changed, 35 insertions(+), 1 deletion(-)

diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml
index cde0e6dc..281ece22 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml
@@ -326,7 +326,7 @@
     </select>
 
     <!--查询待认证用户数量-->
-    <select id="selectCountUnauthorizedAmount" resultType="Integer">
+    <!--<select id="selectCountUnauthorizedAmount" resultType="Integer">
         SELECT
         COUNT(DISTINCT(u.ID))
         FROM
@@ -344,6 +344,40 @@
                 </foreach>
             </otherwise>
         </choose>
+    </select>-->
+
+    <!--查询待认证用户数量-->
+    <select id="selectCountUnauthorizedAmount" resultType="Integer">
+        SELECT
+        COUNT(t.userId)
+        FROM (SELECT
+        u.ID as userId,
+        u.NICKNAME as nickname,
+        u.REGISTER_TIME as registerTime,
+        u.FACE_IMG as faceImg
+        FROM
+        (
+        select  u.ID,
+        u.NICKNAME ,
+        u.FACE_IMG,
+        if(u.DEPT_ID is null or u.DEPT_ID= '0',ug.GRID_ID,u.DEPT_ID) as GRID_ID,
+        u.REGISTER_TIME from epdc_user u
+        LEFT JOIN ( select * from (select * from epdc_user_grid_relation order by CREATED_TIME)t group by t.USER_ID)ug ON ug.USER_ID = u.ID AND ug.DEL_FLAG = '0'
+        where u.DEL_FLAG ='0' and u.PARTY_FLAG = '0' AND u.STATE = '1' and (u.IDENTITY_NO is null or u.IDENTITY_NO = '')
+        )u
+        WHERE
+        <choose>
+            <when test="gridId != null and gridId > 0">u.GRID_ID = #{gridId}</when>
+            <otherwise>
+                u.GRID_ID in
+                <foreach collection="gridIdList" item="item" open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+            </otherwise>
+        </choose>
+        GROUP BY
+        u.ID
+        ORDER BY u.REGISTER_TIME DESC) t
     </select>
 
     <!--  获取用户列表：党员认证失败  -->