diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmetuser/UserBaseInfoDao.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmetuser/UserBaseInfoDao.java
index e79c563c0a..4d77b2b91e 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmetuser/UserBaseInfoDao.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmetuser/UserBaseInfoDao.java
@@ -55,5 +55,5 @@ public interface UserBaseInfoDao extends BaseDao<UserBaseInfoEntity> {
      * @Description 查询userId的身份证号在小程序用户中存在的多个userId值
      * @author sun
      */
-    List<UserBaseInfoDTO> getUserBaseList(@Param("userId") String userId, @Param("customerId") String customerId);
+    List<UserBaseInfoDTO> getUserBaseList(@Param("customerId") String customerId, @Param("userId") String userId, @Param("idCard") String idCard);
 }
\ No newline at end of file
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java
index 7a94473802..cbe81adec8 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java
@@ -35,6 +35,8 @@ import com.epmet.dataaggre.entity.epmetuser.ResiUserBadgeEntity;
 import com.epmet.dataaggre.entity.epmetuser.StaffRoleEntity;
 import com.epmet.dataaggre.entity.govorg.CustomerAgencyEntity;
 import com.epmet.dataaggre.service.datastats.DataStatsService;
+import com.epmet.dataaggre.entity.epmetuser.*;
+import com.epmet.dataaggre.service.datastats.DataStatsService;
 import com.epmet.dataaggre.service.epmetuser.EpmetUserService;
 import com.epmet.dataaggre.service.epmetuser.StaffPatrolDetailService;
 import com.epmet.dataaggre.service.epmetuser.StaffPatrolRecordService;
@@ -721,7 +723,13 @@ public class EpmetUserServiceImpl implements EpmetUserService {
      */
     @Override
     public List<UserBaseInfoDTO> getUserBaseList(String userId, String customerId) {
-        return userBaseInfoDao.getUserBaseList(userId, customerId);
+        List<UserBaseInfoDTO> resultList = new ArrayList<>();
+        List<UserBaseInfoDTO> list = userBaseInfoDao.getUserBaseList(customerId, userId, null);
+        if (!CollectionUtils.isEmpty(list) && StringUtils.isNotBlank(list.get(0).getIdNum())) {
+            return userBaseInfoDao.getUserBaseList(customerId, null, list.get(0).getIdNum());
+        }
+        resultList.addAll(list);
+        return resultList;
     }
 
     /**
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/UserBaseInfoDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/UserBaseInfoDao.xml
index 6c118e2ce0..9ba9386fb3 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/UserBaseInfoDao.xml
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/UserBaseInfoDao.xml
@@ -41,13 +41,24 @@
 
     <select id="getUserBaseList" resultType="com.epmet.dto.UserBaseInfoDTO">
         SELECT
-            *
+            customer_id,
+            user_id,
+            mobile,
+            real_name,
+            id_num,
+            gender,
+            head_img_url
         FROM
             user_base_info
         WHERE
             del_flag = '0'
-        AND id_num = ( SELECT id_num FROM user_base_info WHERE user_id = #{userId})
         AND customer_id = #{customerId}
+        <if test='userId != "" and userId != null'>
+            AND user_id = #{userId}
+        </if>
+        <if test='idCard != "" and idCard != null'>
+            AND id_num = #{idCard}
+        </if>
     </select>
 
 </mapper>
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventDao.xml b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventDao.xml
index fb5d8b7d8f..3b8fbaa1cf 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventDao.xml
+++ b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventDao.xml
@@ -242,6 +242,7 @@
         <foreach item="epmetUserId" collection="epmetUserIdList" open="AND (" separator="or" close=")" index="">
             re.REPORT_USER_ID = #{epmetUserId}
         </foreach>
+        order by re.CREATED_TIME desc
     </select>
 
     <resultMap id="resiEventListResultMap" type="com.epmet.dto.result.ResiEventListResultDTO">
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java
index ddc1eed9c6..ff63a672dc 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java
@@ -343,7 +343,7 @@ public class IcResiUserController {
                     .collect(Collectors.toList());
             List<Map<String, Object>> resiResultList = null;
 
-            pageFormDTO.setPageSize(NumConstant.FIVE_HUNDRED);
+            pageFormDTO.setPageSize(NumConstant.TEN_THOUSAND);
             for (IcResiUserTableEnum tableEnum : resiTableList) {
                 String tableName = tableEnum.getTableName();
                 pageFormDTO.setPageNo(NumConstant.ONE);