【PC端】用户数据分析模块功能完善（导出项调整）-王公峰-2020-07-15

esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/excel/GridOpiningExcel.java

@@ -13,8 +13,8 @@ public class GridOpiningExcel {
     @Excel(name = "网格名称")
     private String allDeptName;
 
-    @Excel(name = "网格党建指导员姓名")
-    private String gridLeader;
+//    @Excel(name = "网格党建指导员姓名")
+//    private String gridLeader;
 
     @Excel(name = "用户总数")
     private Integer registerCount;

esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/user/UserAnalysisDao.xml

@@ -1312,6 +1312,7 @@
         esua_epdc_admin.sys_dept ad
         WHERE
         ad.del_flag = 0
+        AND ad.type_key = 'grid_party'
         <if test="gridIdList != null and gridIdList.size() > 0">
             AND  ad.id in <include refid="foreachGridIdList"></include>
         </if>