diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/PartyMembersController.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/PartyMembersController.java
index 906fc241f..041c651c6 100755
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/PartyMembersController.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/PartyMembersController.java
@@ -158,9 +158,9 @@ public class PartyMembersController {
      * @date 2019/12/29 14:43
      */
     @GetMapping("hasAuthenticationexport")
-    @DataFilter(tableAlias = "eu", prefix = "AND", isPendingCreator = false)
+//    @DataFilter(tableAlias = "eu", prefix = "AND", isPendingCreator = false)
     public void hasAuthenticationexport(@RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
-        ExcelUtils.exportExcelToTarget(response, "已认证党员", partyMembersService.exportHasMoudle(params), PartyMembersExcel.class);
+        ExcelUtils.exportExcelToTarget(response, "已认证党员", partyMembersService.optimizeHasAuthenticationPartyExport(params), PartyMembersExcel.class);
     }
 
     /***
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 93a950381..41d07eec1 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
@@ -183,9 +183,9 @@ public class UserController {
     }
 
     @GetMapping("export")
-    @DataFilter(tableAlias = "u", isPendingCreator = false, deptId = "DEPT_ID", prefix = "AND")
     public void export(@RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
-        List<UserDTO> list = userService.list(params);
+//        List<UserDTO> list = userService.list(params);
+        List<UserDTO> list = userService.authenticatedpageExport(params);
         String auditState = (String) params.get("state");
         // 状态(0-未审核，1-审核通过，2-审核未通过)
         String fileName = null;
@@ -226,9 +226,9 @@ public class UserController {
      * @date 2020/3/18 15:59
      */
     @GetMapping("unauthorizedexport")
-    @DataFilter(tableAlias = "ug", isPendingCreator = false, deptId = "GRID_ID", prefix = "AND")
+//    @DataFilter(tableAlias = "ug", isPendingCreator = false, deptId = "GRID_ID", prefix = "AND")
     public void unauthorizedExport(@RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
-        List<UserDTO> list = userService.list(params);
+        List<UserDTO> list = userService.listExportUn(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/service/PartyMembersService.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/PartyMembersService.java
index 27b1f4f60..564c9f7e3 100755
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/PartyMembersService.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/PartyMembersService.java
@@ -121,6 +121,8 @@ public interface PartyMembersService extends BaseService<PartyMembersEntity> {
      */
     Result<PageData<PartyMembersDTO>> optimizeHasAuthenticationPartyPage(Map<String, Object> params);
 
+    List<PartyMembersDTO> optimizeHasAuthenticationPartyExport(Map<String, Object> params);
+
     /***
      * 通过身份证校验此党员是否被认证
      * @param IdentityNo
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/UserService.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/UserService.java
index 3dacb6903..349181522 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/UserService.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/UserService.java
@@ -55,6 +55,7 @@ public interface UserService extends BaseService<UserEntity> {
     PageData<UserDTO> waitPartyPage(Map<String, Object> params);
 
     List<UserDTO> list(Map<String, Object> params);
+    List<UserDTO> listExportUn(Map<String, Object> params);
 
     /**
      *
@@ -407,4 +408,6 @@ public interface UserService extends BaseService<UserEntity> {
      */
     PageData<UserDTO> authenticatedpage(Map<String, Object> params);
 
+    List<UserDTO> authenticatedpageExport(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/PartyMembersServiceImpl.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/PartyMembersServiceImpl.java
index e031abbff..518271906 100755
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/PartyMembersServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/PartyMembersServiceImpl.java
@@ -518,6 +518,19 @@ public class PartyMembersServiceImpl extends BaseServiceImpl<PartyMembersDao, Pa
             return new Result<PageData<PartyMembersDTO>>().ok(new PageData<>(new ArrayList<>(), NumConstant.ZERO));
         }
 
+    }
+    @Override
+    public List<PartyMembersDTO> optimizeHasAuthenticationPartyExport(Map<String, Object> params) {
+        params.put("deptIdList", SecurityUser.getUser().getDeptIdList());
+//        IPage<String> page = getPage(params);
+        List<String> userIds = baseDao.optimizeHasAuthenticationPartyPage(params);
+        if (userIds.size() > 0) {
+            List<PartyMembersDTO> partyMembersDTOList = baseDao.optimizeHasAuthenticationPartyPageInfo(userIds);
+            return partyMembersDTOList;
+        } else {
+            return new ArrayList<PartyMembersDTO>();
+        }
+
     }
 
     @Override
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 782adb843..d212f90bd 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
@@ -170,6 +170,19 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
             return this.baseDao.selectAuthenticatedListUserDto(params);
         }
     }
+    @Override
+    public List<UserDTO> listExportUn(Map<String, Object> params) {
+        String[] paramKeys = new String[]{"streetId", "communityId", "gridId", "realName", "identityNo", "startTime", "endTime", "nickname", "mobile"};
+        if (AppUserUtils.isDefaultQuery(params, paramKeys)) {
+            List<UserDTO> userDtoList = Lists.newArrayList();
+            return userDtoList;
+        }
+        this.verifyParams(params);
+        // 查询当前用户所具有的的数据权限
+        params.put("deptIdList",SecurityUser.getUser().getDeptIdList());
+        List<UserDTO> userDtoList = this.baseDao.selectListUserDtoByList(params);
+        return userDtoList;
+    }
 
     @Override
     public List<UserDTO> listOfWaitParty(Map<String, Object> params) {
@@ -1591,6 +1604,33 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
 
         }
     }
+    @Override
+    public List<UserDTO> authenticatedpageExport(Map<String, Object> params) {
+        String[] paramKeys = new String[]{"streetId", "communityId", "gridId", "realName", "identityNo", "startTime", "endTime", "nickname", "mobile"};
+        if (AppUserUtils.isDefaultQuery(params, paramKeys)) {
+            List<UserDTO> userDtoList = Lists.newArrayList();
+            return userDtoList;
+        }
+        this.verifyParams(params);
+        // 查询当前用户所具有的的数据权限
+        params.put("deptIdList",SecurityUser.getUser().getDeptIdList());
+        if (NumConstant.ONE_STR.equals(params.get("state").toString())) {
+            // 待认证
+            List<UserDTO> userDtoList = this.baseDao.selectWaitAuthenticatedListUserDto(params);
+            return userDtoList;
+        } else if (NumConstant.THREE_STR.equals(params.get("state").toString())){
+            // 已认证
+            List<UserDTO> userDtoList = this.baseDao.selectAuthenticatedListUserDtoByList(params);
+            return userDtoList;
+        } else {
+            // 认证失败
+            List<UserDTO> userDtoList = this.baseDao.selectFaildAuthenticatedListUserDto(params);
+            return userDtoList;
+
+        }
+    }
+
+
 
     /**
      * 用户信息校验