diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/controller/KpiResultGridController.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/controller/KpiResultGridController.java
index 3b8fed5da..344456c63 100644
--- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/controller/KpiResultGridController.java
+++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/controller/KpiResultGridController.java
@@ -17,6 +17,7 @@
 
 package com.elink.esua.epdc.controller;
 
+import com.elink.esua.epdc.commons.mybatis.annotation.DataFilter;
 import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.commons.tools.utils.ExcelUtils;
 import com.elink.esua.epdc.commons.tools.utils.Result;
@@ -51,6 +52,7 @@ public class KpiResultGridController {
     private KpiResultGridService kpiResultGridService;
 
     @GetMapping("page")
+    @DataFilter(tableAlias = "g", deptId = "grid_id", prefix = "AND", isPendingCreator = false)
     public Result<PageData<KpiResultGridDTO>> page(@RequestParam Map<String, Object> params){
         PageData<KpiResultGridDTO> page = kpiResultGridService.page(params);
         return new Result<PageData<KpiResultGridDTO>>().ok(page);
diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/controller/KpiResultSuperiorController.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/controller/KpiResultSuperiorController.java
index 73c5893e6..3e7185859 100644
--- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/controller/KpiResultSuperiorController.java
+++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/controller/KpiResultSuperiorController.java
@@ -17,6 +17,7 @@
 
 package com.elink.esua.epdc.controller;
 
+import com.elink.esua.epdc.commons.mybatis.annotation.DataFilter;
 import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.commons.tools.utils.ExcelUtils;
 import com.elink.esua.epdc.commons.tools.utils.Result;
@@ -51,6 +52,7 @@ public class KpiResultSuperiorController {
     private KpiResultSuperiorService kpiResultSuperiorService;
 
     @GetMapping("page")
+    @DataFilter(tableAlias = "s", deptId = "dept_id", prefix = "AND", isPendingCreator = false)
     public Result<PageData<KpiResultSuperiorDTO>> page(@RequestParam Map<String, Object> params){
         PageData<KpiResultSuperiorDTO> page = kpiResultSuperiorService.page(params);
         return new Result<PageData<KpiResultSuperiorDTO>>().ok(page);
diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/excel/KpiResultGridDetailExcel.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/excel/KpiResultGridDetailExcel.java
index dce37a050..410aeec01 100644
--- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/excel/KpiResultGridDetailExcel.java
+++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/excel/KpiResultGridDetailExcel.java
@@ -11,7 +11,7 @@ import lombok.Data;
 @Data
 public class KpiResultGridDetailExcel {
 
-    @Excel(name = "排名")
+    @Excel(name = "序号")
     private int rownum;
 
     @Excel(name = "规则")
diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/excel/KpiResultGridExcel.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/excel/KpiResultGridExcel.java
index ddd819cb5..111e53008 100644
--- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/excel/KpiResultGridExcel.java
+++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/excel/KpiResultGridExcel.java
@@ -32,17 +32,8 @@ import java.util.Date;
 @Data
 public class KpiResultGridExcel {
 
-    @Excel(name = "排名")
-    private int rownum;
-
-    @Excel(name = "街道")
-    private String street;
-
-    @Excel(name = "社区")
-    private String community;
-
-    @Excel(name = "网格名称")
-    private String grid;
+    @Excel(name = "所属机构")
+    private String allDeptNames;
 
     @Excel(name = "网格长")
     private String leaderName;
diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiResultGridServiceImpl.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiResultGridServiceImpl.java
index a59c28b79..bec77a09b 100644
--- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiResultGridServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiResultGridServiceImpl.java
@@ -61,16 +61,7 @@ public class KpiResultGridServiceImpl extends BaseServiceImpl<KpiResultGridDao,
     public PageData<KpiResultGridDTO> page(Map<String, Object> params) {
         Integer page = Integer.parseInt(params.get("page").toString());
         Integer limit = Integer.parseInt(params.get("limit").toString());
-        String allDeptIds = "";
-        if (params.get("streetId") != "" && params.get("streetId") != null){
-            allDeptIds = params.get("streetId").toString(); //查询条件 街道
-        }
-        if (params.get("community") != "" && params.get("community") != null){
-            allDeptIds = params.get("community").toString(); //查询条件 社区
-        }
-        if (params.get("gridId") != "" && params.get("gridId") != null){
-            allDeptIds = params.get("gridId").toString(); //查询条件 网格
-        }
+        String allDeptIds = this.queryAffiliatedInstitutionsParams(params);
         params.put("page",(page - 1) * limit);
         params.put("limit", limit);
         params.put("allDeptIds", allDeptIds);
@@ -82,9 +73,32 @@ public class KpiResultGridServiceImpl extends BaseServiceImpl<KpiResultGridDao,
 
     @Override
     public List<KpiResultGridDTO> list(Map<String, Object> params) {
+        String allDeptIds = this.queryAffiliatedInstitutionsParams(params);
+        params.put("allDeptIds", allDeptIds);
         List<KpiResultGridDTO> entityList = baseDao.list(params);
         return entityList;
     }
+    
+    /** 
+     * @Description: 处理所属机构 查询条件
+     * @Param: [params] 
+     * @return: java.lang.String 
+     * @Author: zy 
+     * @Date: 2019-12-26 
+     */ 
+    private String queryAffiliatedInstitutionsParams(Map<String, Object> params){
+        String allDeptIds = "";
+        if (params.get("streetId") != "" && params.get("streetId") != null){
+            allDeptIds = params.get("streetId").toString(); //查询条件 街道
+        }
+        if (params.get("community") != "" && params.get("community") != null){
+            allDeptIds = params.get("community").toString(); //查询条件 社区
+        }
+        if (params.get("gridId") != "" && params.get("gridId") != null){
+            allDeptIds = params.get("gridId").toString(); //查询条件 网格
+        }
+        return allDeptIds;
+    }
 
     private QueryWrapper<KpiResultGridEntity> getWrapper(Map<String, Object> params){
         String id = (String)params.get(FieldConstant.ID_HUMP);
diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiResultSuperiorServiceImpl.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiResultSuperiorServiceImpl.java
index 660c278cd..ff610b216 100644
--- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiResultSuperiorServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiResultSuperiorServiceImpl.java
@@ -59,16 +59,7 @@ public class KpiResultSuperiorServiceImpl extends BaseServiceImpl<KpiResultSuper
     public PageData<KpiResultSuperiorDTO> page(Map<String, Object> params) {
         Integer page = Integer.parseInt(params.get("page").toString());
         Integer limit = Integer.parseInt(params.get("limit").toString());
-        String allDeptIds = "";
-        if (params.get("streetId") != "" && params.get("streetId") != null){
-            allDeptIds = params.get("streetId").toString(); //查询条件 街道
-        }
-        if (params.get("community") != "" && params.get("community") != null){
-            allDeptIds = params.get("community").toString(); //查询条件 社区
-        }
-        if (params.get("gridId") != "" && params.get("gridId") != null){
-            allDeptIds = params.get("gridId").toString(); //查询条件 网格
-        }
+        String allDeptIds = this.queryAffiliatedInstitutionsParams(params);
         params.put("page",(page - 1) * limit);
         params.put("limit", limit);
         params.put("allDeptIds", allDeptIds);
@@ -80,11 +71,34 @@ public class KpiResultSuperiorServiceImpl extends BaseServiceImpl<KpiResultSuper
 
     @Override
     public List<KpiResultSuperiorDTO> list(Map<String, Object> params) {
+        String allDeptIds = this.queryAffiliatedInstitutionsParams(params);
+        params.put("allDeptIds", allDeptIds);
         List<KpiResultSuperiorDTO> dtoList = kpiResultSuperiorDao.exportSuperiorList(params);
 
         return dtoList;
     }
 
+    /**
+     * @Description: 处理所属机构 查询条件
+     * @Param: [params]
+     * @return: java.lang.String
+     * @Author: zy
+     * @Date: 2019-12-26
+     */
+    private String queryAffiliatedInstitutionsParams(Map<String, Object> params){
+        String allDeptIds = "";
+        if (params.get("streetId") != "" && params.get("streetId") != null){
+            allDeptIds = params.get("streetId").toString(); //查询条件 街道
+        }
+        if (params.get("community") != "" && params.get("community") != null){
+            allDeptIds = params.get("community").toString(); //查询条件 社区
+        }
+        if (params.get("gridId") != "" && params.get("gridId") != null){
+            allDeptIds = params.get("gridId").toString(); //查询条件 网格
+        }
+        return allDeptIds;
+    }
+
     private QueryWrapper<KpiResultSuperiorEntity> getWrapper(Map<String, Object> params){
         String id = (String)params.get(FieldConstant.ID_HUMP);
 
diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/mapper/KpiResultGridDao.xml b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/mapper/KpiResultGridDao.xml
index 1a764af0c..b5beb6e80 100644
--- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/mapper/KpiResultGridDao.xml
+++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/mapper/KpiResultGridDao.xml
@@ -52,7 +52,6 @@
     <!--根据查询条件，返回首页 考核统计列表-->
     <select id="selectStatisticalInfoList" resultType="com.elink.esua.epdc.dto.KpiResultGridDTO">
         SELECT
-            @rownum:=@rownum+1 AS rownum,
             g.all_dept_names allDeptNames,
             g.id,
             g.grid_id gridId,
@@ -65,7 +64,6 @@
             g.leader_name leaderName,
             g.kpi_cycle kpiCycle
         FROM
-            (SELECT @rownum:=0) r,
             epdc_kpi_result_grid g
         WHERE
             g.del_flag = '0'
@@ -96,10 +94,6 @@
     <!--自定义默认查询首页统计列表-->
     <select id="list" resultType="com.elink.esua.epdc.dto.KpiResultGridDTO">
         SELECT
-        @rownum:=@rownum+1 AS rownum,
-        (select substring_index(substring_index(g.all_dept_names,'-',2),'-',-1)) street,
-        (select substring_index(substring_index(g.all_dept_names,'-',3),'-',-1)) community,
-        (select substring_index(substring_index(g.all_dept_names,'-',4),'-',-1)) grid,
         g.id,
         g.grid_id gridId,
         g.manual_score manualScore,
@@ -109,9 +103,9 @@
         g.start_date startDate,
         g.end_date endDate,
         g.leader_name leaderName,
+        g.all_dept_names allDeptNames,
         g.kpi_cycle kpiCycle
         FROM
-        (SELECT @rownum:=0) r,
         epdc_kpi_result_grid g
         WHERE
         g.del_flag = '0'
diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/mapper/KpiResultSuperiorDao.xml b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/mapper/KpiResultSuperiorDao.xml
index 35f25c460..727799582 100644
--- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/mapper/KpiResultSuperiorDao.xml
+++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/mapper/KpiResultSuperiorDao.xml
@@ -25,7 +25,7 @@
         <if test="allDeptIds != '' and allDeptIds != null">
             AND s.all_dept_ids like concat('%',#{allDeptIds},'%')
         </if>
-        ORDER BY CREATED_TIME DESC LIMIT #{page},#{limit}
+        ORDER BY finalScore DESC LIMIT #{page},#{limit}
     </select>
 
     <select id="selectSuperiorInfoCount" resultType="int">