bug修改

epdc-cloud-heart/src/main/java/com/elink/esua/epdc/modules/volunteer/excel/VolunteerOrgExcel.java

@@ -56,8 +56,8 @@ public class VolunteerOrgExcel {
     @Excel(name = "管理员手机号")
     private String mobile;
 
-    @Excel(name = "居民端管理员")
+//    @Excel(name = "居民端管理员")
-    private String associatedStates;
+//    private String associatedStates;
 
     @Excel(name = "地址")
     private String address;

epdc-cloud-heart/src/main/resources/mapper/volunteer/VolunteerOrgDao.xml

@@ -79,6 +79,7 @@
         left join (select VOLUNTEER_ORG_ID,count(id) as userCount
                                 from epdc_volunteer
                                 where del_flag='0'
+                                      and state='10'
                                 group by VOLUNTEER_ORG_ID)vo on vo.VOLUNTEER_ORG_ID=o.id
         left join (select VOLUNTEER_ORG_ID,count(r.id) as activityCount
                             from epdc_vact_org_relation r