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 4d0b820e0..b32b806da 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
@@ -19,6 +19,7 @@ package com.elink.esua.epdc.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.elink.esua.epdc.commons.mybatis.enums.DelFlagEnum;
 import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl;
 import com.elink.esua.epdc.commons.tools.constant.Constant;
 import com.elink.esua.epdc.commons.tools.constant.FieldConstant;
@@ -62,17 +63,31 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
     @Override
     public List<UserDTO> list(Map<String, Object> params) {
         List<UserEntity> entityList = baseDao.selectList(getWrapper(params));
-
         return ConvertUtils.sourceToTarget(entityList, UserDTO.class);
     }
 
     private QueryWrapper<UserEntity> getWrapper(Map<String, Object> params){
         String id = (String)params.get("id");
+        String streetId=(String) params.get("streetId");
+        String communityId=(String) params.get("communityId");
+        String gridId=(String) params.get("gridId");
+        String realName=(String) params.get("realName");
+        String mobile=(String) params.get("mobile");
+        String identityNo=(String) params.get("identityNo");
+        String startTime=(String) params.get("startTime");
+        String endTime=(String) params.get("endTime");
 
         QueryWrapper<UserEntity> wrapper = new QueryWrapper<>();
-        wrapper.eq(StringUtils.isNotBlank(id), "id", id);
-        //wrapper.eq(Constant.DEL_FLAG, DelFlagEnum.NORMAL.value());
-
+        wrapper.eq(StringUtils.isNotBlank(id), "ID", id);
+        wrapper.eq(StringUtils.isNotBlank(streetId),"STREET_ID",streetId);
+        wrapper.eq(StringUtils.isNotBlank(communityId),"COMMUNITY_ID",communityId);
+        wrapper.eq(StringUtils.isNotBlank(gridId),"GRID_ID",gridId);
+        wrapper.eq(StringUtils.isNotBlank(realName),"REAL_NAME",realName);
+        wrapper.eq(StringUtils.isNotBlank(mobile),"MOBILE",mobile);
+        wrapper.eq(StringUtils.isNotBlank(identityNo),"IDENTITY_NO",identityNo);
+        wrapper.ge(StringUtils.isNotBlank(startTime),"REGISTER_TIME",startTime);
+        wrapper.lt(StringUtils.isNotBlank(endTime),"REGISTER_TIME",endTime);
+//        wrapper.eq(Constant.DEL_FLAG, DelFlagEnum.NORMAL.value());
         return wrapper;
     }