From a3060b8930e15e425533d3fd4ac28c6b02bbe5ca Mon Sep 17 00:00:00 2001
From: wanggongfeng <1305282856@qq.com>
Date: Fri, 31 Jul 2020 13:47:04 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=B7=A5=E4=BD=9C=E7=AB=AF=E5=B0=8F?=
 =?UTF-8?q?=E7=A8=8B=E5=BA=8F=E3=80=91=E9=A6=96=E9=A1=B5=E5=BE=85=E8=AE=A4?=
 =?UTF-8?q?=E8=AF=81=E5=B1=85=E6=B0=91=E6=95=B0=E9=87=8F-=E7=8E=8B?=
 =?UTF-8?q?=E5=85=AC=E5=B3=B0-2020-07-31?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/UserDao.xml     | 52 +++++++++++++++----
 1 file changed, 41 insertions(+), 11 deletions(-)

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 af642d3bc..c82ef1003 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
@@ -305,22 +305,52 @@
     <!--查询待认证用户数量-->
     <select id="selectCountUnauthorizedAmount" resultType="Integer">
         SELECT
-        COUNT(DISTINCT(u.ID))
+        count(*)
+        FROM (
+        SELECT
+        DISTINCT
+        u.ID,
+        u.REAL_NAME,
+        u.NICKNAME,
+        u.MOBILE,
+        u.REGISTER_TIME,
+        u.CREATED_TIME,
+        u.UPDATED_TIME,
+        u.IDENTITY_NO,
+        u.ADDRESS,
+        u.STATE,
+        u.PARTY_FLAG,
+        u.ALL_DEPT_NAMES,
+        u.FACE_IMG,
+        u.PARENT_DEPT_IDS,
+        u.ALL_DEPT_IDS,
+        (
+        SELECT AUTHENTICATED_TYPE
+        FROM epdc_user_authenticate_history
+        WHERE DEL_FLAG = '0' AND AUTHENTICATED_TYPE IN ( '0', '1' ) AND USER_ID = u.ID ORDER BY CREATED_TIME DESC, id LIMIT 1
+        ) AS AUTHENTICATED_TYPE,
+        (
+        SELECT AUTHENTICATED_FLAG
+        FROM epdc_user_authenticate_history
+        WHERE DEL_FLAG = '0' AND AUTHENTICATED_TYPE IN ( '0', '1' ) AND USER_ID = u.ID ORDER BY CREATED_TIME DESC , id LIMIT 1
+        ) AS AUTHENTICATED_FLAG
         FROM
-        epdc_user_grid_relation ug
-        LEFT JOIN epdc_user u ON u.ID = ug.USER_ID
-        WHERE
-        u.PARTY_FLAG = '0'AND
-        u.DEL_FLAG = '0' AND ug.DEL_FLAG = '0' AND u.STATE = '1'
+        epdc_user u
+        where  u.DEL_FLAG = '0'
         <choose>
-            <when test="gridId != null and gridId > 0">AND ug.GRID_ID = #{gridId}</when>
+            <when test="gridId != null and gridId > 0">AND u.DEPT_ID = #{gridId}</when>
             <otherwise>
-                AND ug.GRID_ID in
-                <foreach collection="gridIdList" item="item" open="(" separator="," close=")">
-                    #{item}
-                </foreach>
+                <if test="gridIdList!=null and gridIdList.size()>0">
+                    AND u.DEPT_ID in
+                    <foreach collection="gridIdList" item="item" open="(" separator="," close=")">
+                        #{item}
+                    </foreach>
+                </if>
             </otherwise>
         </choose>
+        ) user
+        where
+        user.AUTHENTICATED_TYPE = '0' AND user.AUTHENTICATED_FLAG = '2'
     </select>
 
     <!--  获取用户列表：党员认证失败  -->