diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/dao/MetaUserRegisterRankDao.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/dao/MetaUserRegisterRankDao.java
index f027e96ee..86223fd00 100644
--- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/dao/MetaUserRegisterRankDao.java
+++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/dao/MetaUserRegisterRankDao.java
@@ -17,10 +17,14 @@
 
 package com.elink.esua.epdc.modules.user.dao;
 
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.elink.esua.epdc.commons.mybatis.dao.BaseDao;
 import com.elink.esua.epdc.modules.user.entity.MetaUserRegisterRankEntity;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * 用户注册排行
  *
@@ -29,5 +33,23 @@ import org.apache.ibatis.annotations.Mapper;
  */
 @Mapper
 public interface MetaUserRegisterRankDao extends BaseDao<MetaUserRegisterRankEntity> {
-	
+
+    /***
+     * 分页
+     * @param params
+     * @return java.util.List<com.elink.esua.epdc.modules.user.entity.MetaUserRegisterRankEntity>
+     * @author qushutong
+     * @date 2020/3/26 15:41
+     */
+    List<MetaUserRegisterRankEntity> selectPageUserRegisterRank(Map<String,Object> params);
+
+
+    /***
+     * 获取当前用户拥有权限的街道id
+     * @param params
+     * @return java.util.List<java.lang.String>
+     * @author qushutong
+     * @date 2020/3/26 16:54
+     */
+    List<String> selectListStreetId(Map<String,Object> params);
 }
\ No newline at end of file
diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/MetaUserRegisterRankService.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/MetaUserRegisterRankService.java
index 447a89e68..82adfb5f2 100644
--- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/MetaUserRegisterRankService.java
+++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/MetaUserRegisterRankService.java
@@ -95,7 +95,7 @@ public interface MetaUserRegisterRankService extends BaseService<MetaUserRegiste
     void delete(String[] ids);
 
     /***
-     * 导入用户注册排行
+     * 导入用户注册
      * @param
      * @return com.elink.esua.epdc.commons.tools.utils.Result
      * @author qushutong
diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/impl/MetaUserRegisterRankServiceImpl.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/impl/MetaUserRegisterRankServiceImpl.java
index f3bdf02b5..725348551 100644
--- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/impl/MetaUserRegisterRankServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/impl/MetaUserRegisterRankServiceImpl.java
@@ -21,8 +21,10 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl;
 import com.elink.esua.epdc.commons.tools.page.PageData;
+import com.elink.esua.epdc.commons.tools.security.user.SecurityUser;
 import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
 import com.elink.esua.epdc.commons.tools.constant.FieldConstant;
+import com.elink.esua.epdc.commons.tools.utils.DateUtils;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.datasources.DataSourceNames;
 import com.elink.esua.epdc.datasources.annotation.DataSource;
@@ -37,10 +39,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.text.SimpleDateFormat;
+import java.util.*;
 
 /**
  * 用户注册排行
@@ -54,12 +54,23 @@ public class MetaUserRegisterRankServiceImpl extends BaseServiceImpl<MetaUserReg
     @Autowired
     private UserAnalysisService userAnalysisService;
     @Override
+    @DataSource(name = DataSourceNames.TWELVE)
     public PageData<MetaUserRegisterRankDTO> page(Map<String, Object> params) {
-        IPage<MetaUserRegisterRankEntity> page = baseDao.selectPage(
-                getPage(params, FieldConstant.CREATED_TIME, false),
-                getWrapper(params)
-        );
-        return getPageData(page, MetaUserRegisterRankDTO.class);
+        IPage<MetaUserRegisterRankEntity> page = getPage(params);
+        // 获取权限下的街道id
+        List<String> streetIdList = getListStreetId();
+        params.put("streetIdList",streetIdList);
+        SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
+        String time = (String) params.get("createdTime");
+        if(StringUtils.isBlank(time)){
+            String createdTime = format.format(new Date());
+            params.put("createdTime",createdTime);
+        }else {
+            String createdTime = DateUtils.dealDateFormat(time);
+            params.put("createdTime",createdTime);
+        }
+        List<MetaUserRegisterRankEntity> metaUserRegisterRankEntities = baseDao.selectPageUserRegisterRank(params);
+        return getPageData(metaUserRegisterRankEntities,page.getTotal(), MetaUserRegisterRankDTO.class);
     }
 
     @Override
@@ -115,4 +126,17 @@ public class MetaUserRegisterRankServiceImpl extends BaseServiceImpl<MetaUserReg
         return insertBatch(metaUserRegisterRankEntities) ? new Result():new Result().error("导入注册用户排行失败");
     }
 
+    /***
+     * 获取当前用户拥有权限的街道id
+     * @param
+     * @return java.util.List<java.lang.String>
+     * @author qushutong
+     * @date 2020/3/26 16:57
+     */
+    public List<String> getListStreetId() {
+        Map params = new HashMap();
+        params.put("deptIdList", SecurityUser.getUser().getDeptIdList());
+        return baseDao.selectListStreetId(params);
+    }
+
 }
\ No newline at end of file
diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/user/MetaUserRegisterRankDao.xml b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/user/MetaUserRegisterRankDao.xml
index d7fd20494..592c90d7c 100644
--- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/user/MetaUserRegisterRankDao.xml
+++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/user/MetaUserRegisterRankDao.xml
@@ -25,6 +25,47 @@
         <result property="updatedBy" column="UPDATED_BY"/>
         <result property="updatedTime" column="UPDATED_TIME"/>
     </resultMap>
+    <select id="selectPageUserRegisterRank" resultMap="metaUserRegisterRankMap">
+        SELECT
+        *
+        FROM
+        meta_epdc_user_register_rank rr
+        WHERE
+        del_flag = '0'
+        <if test="streetId!=null and streetId != ''">
+            and rr.STREET_ID = #{streetId}
+        </if>
+        <if test="createdTime!=null and  createdTime != ''">
+            and rr.CREATED_TIME like concat('%', #{createdTime}, '%')
+        </if>
+        <if test="streetIdList!=null and streetIdList.size()>0">
+            and rr.STREET_ID in
+            <foreach collection="streetIdList" index="index" item="streetId" open="(" separator="," close=")">
+                #{streetId}
+            </foreach>
+        </if>
+    </select>
 
-
+    <select id="selectListStreetId" resultType="String">
+          SELECT
+             ad2.id streetId
+            FROM
+                esua_epdc_user.epdc_user uu
+            LEFT JOIN esua_epdc_admin.sys_dept ad ON uu.DEPT_ID = ad.ID
+            AND ad.type_key = 'grid_party'
+            LEFT JOIN esua_epdc_admin.sys_dept ad1 ON ad1.id = ad.pid
+            LEFT JOIN esua_epdc_admin.sys_dept ad2 ON ad2.id = ad1.pid
+            WHERE
+                uu.DEL_FLAG = '0'
+                <if test="deptIdList!=null and deptIdList.size()>0">
+                    and ad2.ID in
+                    <foreach collection="deptIdList" index="index" item="deptId" open="(" separator="," close=")">
+                        #{deptId}
+                    </foreach>
+                </if>
+            AND ad.id IS NOT NULL
+            AND ad2.id IS NOT NULL
+            GROUP BY
+                ad2.id
+    </select>
 </mapper>
\ No newline at end of file