From e1aea434241b467f8db1f0bacbab6744d7b79d18 Mon Sep 17 00:00:00 2001
From: liuchuang <m18800112042_2@163.com>
Date: Wed, 1 Apr 2020 18:32:45 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BE=85=E8=AE=A4=E8=AF=81?=
 =?UTF-8?q?=E5=85=9A=E5=91=98=E5=AF=BC=E5=87=BA=E5=BC=82=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../esua/epdc/controller/UserController.java  |  2 +-
 .../java/com/elink/esua/epdc/dao/UserDao.java | 11 +++++
 .../epdc/service/impl/UserServiceImpl.java    | 12 ++++--
 .../src/main/resources/mapper/UserDao.xml     | 41 +++++++++++++++++++
 4 files changed, 62 insertions(+), 4 deletions(-)

diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/UserController.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/UserController.java
index 7093d38c7..6ffc2d6dd 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/UserController.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/UserController.java
@@ -209,7 +209,7 @@ public class UserController {
      * @since 2020/3/24 16:00
      */
     @GetMapping("exportWaitParty")
-    @DataFilter(tableAlias = "ug", isPendingCreator = false, deptId = "GRID_ID", prefix = "AND")
+    @DataFilter(tableAlias = "u", isPendingCreator = false, deptId = "DEPT_ID", prefix = "AND")
     public void exportWaitParty(@RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
         List<UserDTO> list = userService.listOfWaitParty(params);
         ExcelUtils.exportExcelToTarget(response, "待认证党员", list, UserExcel.class);
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/UserDao.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/UserDao.java
index 7827dccb7..aa108f1d7 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/UserDao.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/UserDao.java
@@ -210,4 +210,15 @@ public interface UserDao extends BaseDao<UserEntity> {
      */
     List<UserDTO> selectAuthenticatedListUserDto(Map<String, Object> params);
 
+    /**
+     *
+     * 待认证居民
+     *
+     * @params [params]
+     * @return java.util.List<com.elink.esua.epdc.dto.UserDTO>
+     * @author liuchuang
+     * @since 2020/4/1 18:26
+     */
+    List<UserDTO> selectWaitAuthenticatedListUserDto(Map<String, Object> params);
+
 }
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java
index 5ca3910c7..39ea19168 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java
@@ -1281,9 +1281,15 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
         }
         this.verifyParams(params);
         // 查询当前用户所具有的的数据权限
-        IPage<UserDTO> iPage = this.getPage(params);
-        List<UserDTO> userDtoList = this.baseDao.selectAuthenticatedListUserDto(params);
-        return new PageData<>(userDtoList, iPage.getTotal());
+        if (NumConstant.ONE_STR.equals(params.get("state").toString())) {
+            IPage<UserDTO> iPage = this.getPage(params);
+            List<UserDTO> userDtoList = this.baseDao.selectWaitAuthenticatedListUserDto(params);
+            return new PageData<>(userDtoList, iPage.getTotal());
+        } else {
+            IPage<UserDTO> iPage = this.getPage(params);
+            List<UserDTO> userDtoList = this.baseDao.selectAuthenticatedListUserDto(params);
+            return new PageData<>(userDtoList, iPage.getTotal());
+        }
     }
 
     /**
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 129ecfcd5..5c8630129 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
@@ -454,6 +454,47 @@
 
 
     <select id="selectAuthenticatedListUserDto" resultType="com.elink.esua.epdc.dto.UserDTO">
+        SELECT
+        u.id,
+        u.REAL_NAME,
+        u.NICKNAME,
+        u.MOBILE,
+        u.REGISTER_TIME,
+        u.CREATED_TIME,
+        IDENTITY_NO,
+        ADDRESS,
+        STATE,
+        PARTY_FLAG,
+        u.ALL_DEPT_NAMES,
+        u.FACE_IMG
+        FROM
+        epdc_user u
+        where
+        u.del_flag = '0'
+        <if test="startTime != '' and endTime != ''">and u.CREATED_TIME between #{startTime} and #{endTime}</if>
+        <if test="state != '' and state != null">and u.state = #{state}</if>
+        <if test="realName != '' and realName != null">and u.real_name like '%${realName}%'</if>
+        <if test="nickname != '' and nickname != null">and u.NICKNAME like '%${nickname}%'</if>
+        <if test="mobile != '' and mobile != null">and u.mobile like '%${mobile}%'</if>
+        <if test="identityNo != '' and identityNo != null">and u.identity_no like '%${identityNo}%'</if>
+        <if test="partyFlag != '' and partyFlag != null">and u.party_flag = #{partyFlag}</if>
+        <if test="streetId != '' and streetId != null">
+            AND (find_in_set(#{streetId},u.PARENT_DEPT_IDS)
+            OR find_in_set(#{streetId},u.ALL_DEPT_IDS))
+        </if>
+        <if test="communityId != '' and communityId != null">
+            AND (find_in_set(#{communityId},u.PARENT_DEPT_IDS)
+            OR find_in_set(#{communityId},u.ALL_DEPT_IDS))
+        </if>
+        <if test="gridId != '' and gridId != null">
+            AND
+            find_in_set(#{gridId},u.ALL_DEPT_IDS)
+        </if>
+        ORDER BY
+        u.register_time desc
+    </select>
+
+    <select id="selectWaitAuthenticatedListUserDto" resultType="com.elink.esua.epdc.dto.UserDTO">
         SELECT
         u.id,
         u.REAL_NAME,