社会组织删除组织-成员关联表，修改业务

epdc-cloud-heart/src/main/java/com/elink/esua/epdc/modules/volunteer/controller/VactOrgTypeController.java

@@ -81,8 +81,7 @@ public class VactOrgTypeController {
     public Result delete(@RequestBody String[] ids){
         //效验数据
         AssertUtils.isArrayEmpty(ids, "id");
-        vactOrgTypeService.delete(ids);
-        return new Result();
+        return vactOrgTypeService.delete(ids);
     }
 
     @GetMapping("export")

epdc-cloud-heart/src/main/java/com/elink/esua/epdc/modules/volunteer/controller/VolunteerController.java

@@ -29,6 +29,7 @@ import com.elink.esua.epdc.modules.volunteer.dao.VolunteerDao;
 import com.elink.esua.epdc.modules.volunteer.excel.VolunteerExcel;
 import com.elink.esua.epdc.modules.volunteer.service.VolunteerService;
 import com.elink.esua.epdc.volunteer.AppVolunteerApplyDTO;
+import com.elink.esua.epdc.volunteer.AppVorgFormDTO;
 import com.elink.esua.epdc.volunteer.VolunteerDTO;
 import com.elink.esua.epdc.volunteer.VolunteerPageDTO;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -133,4 +134,66 @@ public class VolunteerController {
         return volunteerService.getVolunteerDetail(formDto);
     }
 
+
+    /**
+    * @describe: 小程序-社会组织-组织分类列表
+    * @author wangtong
+    * @date 2021/9/26 15:24
+    * @params [formDto]
+    * @return com.elink.esua.epdc.commons.tools.utils.Result
+    */
+    @GetMapping("getOrgTypeList")
+    public Result getOrgTypeList(@RequestBody AppVorgFormDTO formDto) {
+        return volunteerService.getOrgTypeList(formDto);
+    }
+
+    /**
+    * @describe: 小程序-社会组织-组织列表
+    * @author wangtong
+    * @date 2021/9/26 15:24
+    * @params [formDto]
+    * @return com.elink.esua.epdc.commons.tools.utils.Result
+    */
+    @GetMapping("getOrgListByType")
+    public Result getOrgListByType(@RequestBody AppVorgFormDTO formDto) {
+        return volunteerService.getOrgListByType(formDto);
+    }
+
+    /**
+    * @describe: 小程序-社会组织-组织详情
+    * @author wangtong
+    * @date 2021/9/26 15:24
+    * @params [formDto]
+    * @return com.elink.esua.epdc.commons.tools.utils.Result
+    */
+    @GetMapping("getOrgDetail")
+    public Result getOrgDetail(@RequestBody AppVorgFormDTO formDto) {
+        return volunteerService.getOrgDetail(formDto);
+    }
+
+    /**
+    * @describe: 小程序-社会组织-组织详情列表
+    * @author wangtong
+    * @date 2021/9/26 15:24
+    * @params [formDto]
+    * @return com.elink.esua.epdc.commons.tools.utils.Result
+    */
+    @GetMapping("getOrgDetailList")
+    public Result getOrgDetailList(@RequestBody AppVorgFormDTO formDto) {
+        return volunteerService.getOrgDetailList(formDto);
+    }
+
+    /**
+    * @describe: 小程序-社会组织-成员管理列表
+    * @author wangtong
+    * @date 2021/9/26 15:24
+    * @params [formDto]
+    * @return com.elink.esua.epdc.commons.tools.utils.Result
+    */
+    @GetMapping("getVolunteerList")
+    public Result getVolunteerList(@RequestBody AppVorgFormDTO formDto) {
+        return volunteerService.getVolunteerList(formDto);
+    }
+
+
 }

epdc-cloud-heart/src/main/java/com/elink/esua/epdc/modules/volunteer/dao/VolunteerDao.java

@@ -80,4 +80,22 @@ public interface VolunteerDao extends BaseDao<VolunteerEntity> {
     * @return java.util.List<java.lang.Long>
     */
     List<Long> getOrgIdListByUserId(@Param("userId") String userId);
+
+    /**
+    * @describe: 根据用户id和组织ID查询
+    * @author wangtong
+    * @date 2021/9/27 15:16
+    * @params [userId, orgId]
+    * @return com.elink.esua.epdc.modules.volunteer.entity.VolunteerEntity
+    */
+    VolunteerEntity getByUserIdAndOrgId(@Param("userId") String userId,@Param("orgId") Long orgId);
+
+    /**
+    * @describe: 设置旧管理员为普通群成员
+    * @author wangtong
+    * @date 2021/9/27 16:19
+    * @params [id]
+    * @return void
+    */
+    void updateAdminUser(@Param("orgId") Long id);
 }

epdc-cloud-heart/src/main/java/com/elink/esua/epdc/modules/volunteer/dao/VolunteerOrgDao.java

@@ -19,6 +19,9 @@ package com.elink.esua.epdc.modules.volunteer.dao;
 
 import com.elink.esua.epdc.commons.mybatis.dao.BaseDao;
 import com.elink.esua.epdc.modules.volunteer.entity.VolunteerOrgEntity;
+import com.elink.esua.epdc.volunteer.AppVorgFormDTO;
+import com.elink.esua.epdc.volunteer.OrgListByTypeResultDTO;
+import com.elink.esua.epdc.volunteer.OrgTypeListResultDTO;
 import com.elink.esua.epdc.volunteer.VolunteerOrgDTO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -70,4 +73,31 @@ public interface VolunteerOrgDao extends BaseDao<VolunteerOrgEntity> {
     * @return java.util.List<com.elink.esua.epdc.volunteer.VolunteerOrgDTO>
     */
     List<VolunteerOrgDTO> getAppVolunteerOrgList();
+
+    /**
+     * @describe: 小程序-社会组织-组织分类列表
+     * @author wangtong
+     * @date 2021/9/26 15:24
+     * @params [formDto]
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     */
+    List<OrgTypeListResultDTO> getOrgTypeList();
+
+    /**
+     * @describe: 小程序-社会组织-组织列表
+     * @author wangtong
+     * @date 2021/9/26 15:24
+     * @params [formDto]
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     */
+    List<OrgListByTypeResultDTO> getOrgListByType(AppVorgFormDTO formDto);
+
+    /**
+    * @describe: 检查组织分类下有没有组织
+    * @author wangtong
+    * @date 2021/9/27 16:34
+    * @params [typeId]
+    * @return java.util.List<com.elink.esua.epdc.modules.volunteer.entity.VolunteerOrgEntity>
+    */
+    List<VolunteerOrgEntity> getByTypeId(@Param("typeId") String typeId);
 }

epdc-cloud-heart/src/main/java/com/elink/esua/epdc/modules/volunteer/entity/VolunteerEntity.java

@@ -45,6 +45,16 @@ public class VolunteerEntity extends BaseEpdcEntity {
      */
 	private String idCard;
 
+	/**
+	 * 管理员标识：0否1是
+	 */
+	private String adminFlag;
+
+	/**
+	 * 志愿组织id
+	 */
+	private Long volunteerOrgId;
+
     /**
      * 电话
      */

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

@@ -32,24 +32,33 @@ public class VolunteerOrgExcel {
 //    @Excel(name = "主键")
 //    private String id;
 
+    /**
+     * 组织类型
+     */
+    @Excel(name = "组织类型")
+    private String orgTypeName;
+
     @Excel(name = "组织名称")
     private String volunteerOrgName;
 
 //    @Excel(name = "组织编码")
 //    private String volunteerOrgCode;
 
-    @Excel(name = "是否启用",replace = { "启用_0", "禁用_1"})
-    private String isOpen;
+//    @Excel(name = "是否启用",replace = { "启用_0", "禁用_1"})
+//    private String isOpen;
 
-    @Excel(name = "排序")
-    private Integer sort;
+//    @Excel(name = "排序")
+//    private Integer sort;
 
-    @Excel(name = "负责人")
+    @Excel(name = "管理员姓名")
     private String headName;
 
-    @Excel(name = "负责电话")
+    @Excel(name = "管理员手机号")
     private String mobile;
 
+    @Excel(name = "居民端管理员")
+    private String associatedStates;
+
     @Excel(name = "地址")
     private String address;
 

epdc-cloud-heart/src/main/java/com/elink/esua/epdc/modules/volunteer/service/VactOrgTypeService.java

@@ -93,7 +93,7 @@ public interface VactOrgTypeService extends BaseService<VactOrgTypeEntity> {
      * @author generator
      * @date 2021-09-23
      */
-    void delete(String[] ids);
+    Result delete(String[] ids);
 
     /**
      * @describe: 获取组织类型列表

epdc-cloud-heart/src/main/java/com/elink/esua/epdc/modules/volunteer/service/VolunteerService.java

@@ -23,6 +23,7 @@ import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.modules.volunteer.entity.VolunteerEntity;
 import com.elink.esua.epdc.volunteer.AppVolunteerApplyDTO;
+import com.elink.esua.epdc.volunteer.AppVorgFormDTO;
 import com.elink.esua.epdc.volunteer.VolunteerDTO;
 import com.elink.esua.epdc.volunteer.VolunteerPageDTO;
 
@@ -133,4 +134,49 @@ public interface VolunteerService extends BaseService<VolunteerEntity> {
      * @return com.elink.esua.epdc.commons.tools.utils.Result
      */
     Result getVolunteerDetail(AppVolunteerApplyDTO formDto);
+
+    /**
+     * @describe: 小程序-社会组织-组织分类列表
+     * @author wangtong
+     * @date 2021/9/26 15:24
+     * @params [formDto]
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     */
+    Result getOrgTypeList(AppVorgFormDTO formDto);
+
+    /**
+     * @describe: 小程序-社会组织-组织列表
+     * @author wangtong
+     * @date 2021/9/26 15:24
+     * @params [formDto]
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     */
+    Result getOrgListByType(AppVorgFormDTO formDto);
+
+    /**
+     * @describe: 小程序-社会组织-组织详情
+     * @author wangtong
+     * @date 2021/9/26 15:24
+     * @params [formDto]
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     */
+    Result getOrgDetail(AppVorgFormDTO formDto);
+
+    /**
+     * @describe: 小程序-社会组织-组织详情列表
+     * @author wangtong
+     * @date 2021/9/26 15:24
+     * @params [formDto]
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     */
+    Result getOrgDetailList(AppVorgFormDTO formDto);
+
+    /**
+     * @describe: 小程序-社会组织-成员管理列表
+     * @author wangtong
+     * @date 2021/9/26 15:24
+     * @params [formDto]
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     */
+    Result getVolunteerList(AppVorgFormDTO formDto);
 }

epdc-cloud-heart/src/main/java/com/elink/esua/epdc/modules/volunteer/service/impl/VactOrgTypeServiceImpl.java

@@ -17,6 +17,7 @@
 
 package com.elink.esua.epdc.modules.volunteer.service.impl;
 
+import com.alibaba.nacos.client.naming.utils.CollectionUtils;
 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;
@@ -26,7 +27,9 @@ import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.modules.volunteer.dao.VactOrgTypeDao;
+import com.elink.esua.epdc.modules.volunteer.dao.VolunteerOrgDao;
 import com.elink.esua.epdc.modules.volunteer.entity.VactOrgTypeEntity;
+import com.elink.esua.epdc.modules.volunteer.entity.VolunteerOrgEntity;
 import com.elink.esua.epdc.modules.volunteer.redis.VactOrgTypeRedis;
 import com.elink.esua.epdc.modules.volunteer.service.VactOrgTypeService;
 import com.elink.esua.epdc.volunteer.VactOrgTypeDTO;
@@ -51,6 +54,9 @@ public class VactOrgTypeServiceImpl extends BaseServiceImpl<VactOrgTypeDao, Vact
     @Autowired
     private VactOrgTypeRedis vactOrgTypeRedis;
 
+    @Autowired
+    private VolunteerOrgDao volunteerOrgDao;
+
     @Override
     public PageData<VactOrgTypeDTO> page(Map<String, Object> params) {
         IPage<VactOrgTypeDTO> page = getPage(params);
@@ -119,9 +125,16 @@ public class VactOrgTypeServiceImpl extends BaseServiceImpl<VactOrgTypeDao, Vact
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void delete(String[] ids) {
+    public Result delete(String[] ids) {
+        for(String id : ids){
+            List<VolunteerOrgEntity> orgList = volunteerOrgDao.getByTypeId(id);
+            if(!CollectionUtils.isEmpty(orgList)){
+                return new Result().error("该类型下存在组织，暂不能删除。");
+            }
+        }
         // 逻辑删除（@TableLogic 注解）
         baseDao.deleteBatchIds(Arrays.asList(ids));
+        return new Result().ok("操作成功");
     }
 
     @Override

epdc-cloud-heart/src/main/java/com/elink/esua/epdc/modules/volunteer/service/impl/VolunteerOrgServiceImpl.java

@@ -28,10 +28,11 @@ import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.UserDTO;
 import com.elink.esua.epdc.modules.feign.UserInfoFeignClient;
+import com.elink.esua.epdc.modules.volunteer.dao.VolunteerDao;
 import com.elink.esua.epdc.modules.volunteer.dao.VolunteerOrgDao;
 import com.elink.esua.epdc.modules.volunteer.dao.VolunteerOrgRelationDao;
+import com.elink.esua.epdc.modules.volunteer.entity.VolunteerEntity;
 import com.elink.esua.epdc.modules.volunteer.entity.VolunteerOrgEntity;
-import com.elink.esua.epdc.modules.volunteer.entity.VolunteerOrgRelationEntity;
 import com.elink.esua.epdc.modules.volunteer.redis.VolunteerOrgRedis;
 import com.elink.esua.epdc.modules.volunteer.service.VolunteerOrgService;
 import com.elink.esua.epdc.volunteer.VolunteerOrgDTO;
@@ -62,6 +63,9 @@ public class VolunteerOrgServiceImpl extends BaseServiceImpl<VolunteerOrgDao, Vo
     @Autowired
     private VolunteerOrgRelationDao volunteerOrgRelationDao;
 
+    @Autowired
+    private VolunteerDao volunteerDao;
+
     @Override
     public PageData<VolunteerOrgDTO> page(Map<String, Object> params) {
 //        IPage<VolunteerOrgEntity> page = baseDao.selectPage(
@@ -116,12 +120,36 @@ public class VolunteerOrgServiceImpl extends BaseServiceImpl<VolunteerOrgDao, Vo
         } else if (userResult.getData() == null){
             return new Result().ok("管理员手机号未关联到居民端用户，请检查管理员手机号或提醒该手机号用户在居民端注册。");
         }else{
-            VolunteerOrgRelationEntity relationEntity = new VolunteerOrgRelationEntity();
             UserDTO userInfo = JSONObject.parseObject(userResult.getData().toString(), UserDTO.class);
-            relationEntity.setVolunteerId(userInfo.getId());
-            relationEntity.setVolunteerOrgId(orgId);
-            relationEntity.setAdminFlag(1);
-            volunteerOrgRelationDao.insert(relationEntity);
+            //先检查此用户有没有在群里
+            VolunteerEntity entity = volunteerDao.getByUserIdAndOrgId(userInfo.getId(),orgId);
+            //不在，新增用户，并设置成群主
+            if(entity == null){
+                VolunteerEntity newEntity = new VolunteerEntity();
+                newEntity.setVolunteerOrgId(orgId);
+                newEntity.setAdminFlag("1");
+                newEntity.setRealName(dto.getHeadName());
+                newEntity.setIdCard(userInfo.getIdentityNo());
+                newEntity.setMobile(dto.getMobile());
+//                newEntity.setIntroduceInfo();
+                newEntity.setState("10");
+                newEntity.setUserId(userInfo.getId());
+                newEntity.setFaceImg(userInfo.getFaceImg());
+                newEntity.setPartyFlag(userInfo.getPartyFlag());
+                newEntity.setDeptId(userInfo.getDeptId().toString());
+                if(StringUtils.isNotBlank(userInfo.getAllDeptNames())){
+                    newEntity.setDeptName(userInfo.getAllDeptNames().substring(userInfo.getAllDeptNames().lastIndexOf("-")+1,userInfo.getAllDeptNames().length()));
+                }
+                newEntity.setParentDeptIds(userInfo.getParentDeptIds());
+                newEntity.setParentDeptNames(userInfo.getParentDeptNames());
+                newEntity.setAllDeptIds(userInfo.getAllDeptIds());
+                newEntity.setAllDeptNames(userInfo.getAllDeptNames());
+                volunteerDao.insert(newEntity);
+            }else {//在，不是群主，修改状态设置为群主
+                entity.setAdminFlag("1");
+                entity.setState("10");//审核通过
+                volunteerDao.updateById(entity);
+            }
             return new Result().ok("管理员手机号已成功关联居民端用户，该手机号居民端用户已被设置为该组织管理员。");
         }
     }
@@ -135,8 +163,8 @@ public class VolunteerOrgServiceImpl extends BaseServiceImpl<VolunteerOrgDao, Vo
         }
         VolunteerOrgEntity entity = ConvertUtils.sourceToTarget(dto, VolunteerOrgEntity.class);
         updateById(entity);
-        //删除原先的管理员，重新设置
-        volunteerOrgRelationDao.deleteAdminUserForOrg(entity.getId());
+        //先设置旧管理员为普通成员
+        volunteerDao.updateAdminUser(entity.getId());
         return setAdminUserForOrg(dto,entity.getId());
     }
 

epdc-cloud-heart/src/main/java/com/elink/esua/epdc/modules/volunteer/service/impl/VolunteerServiceImpl.java

@@ -21,20 +21,19 @@ 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.constant.FieldConstant;
+import com.elink.esua.epdc.commons.tools.constant.NumConstant;
 import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.modules.volunteer.dao.VolunteerDao;
+import com.elink.esua.epdc.modules.volunteer.dao.VolunteerOrgDao;
 import com.elink.esua.epdc.modules.volunteer.dao.VolunteerOrgRelationDao;
 import com.elink.esua.epdc.modules.volunteer.entity.VolunteerEntity;
 import com.elink.esua.epdc.modules.volunteer.entity.VolunteerOrgRelationEntity;
 import com.elink.esua.epdc.modules.volunteer.redis.VolunteerRedis;
 import com.elink.esua.epdc.modules.volunteer.service.VolunteerOrgRelationService;
 import com.elink.esua.epdc.modules.volunteer.service.VolunteerService;
-import com.elink.esua.epdc.volunteer.AppVolunteerApplyDTO;
-import com.elink.esua.epdc.volunteer.AppVolunteerDetailDTO;
-import com.elink.esua.epdc.volunteer.VolunteerDTO;
-import com.elink.esua.epdc.volunteer.VolunteerPageDTO;
+import com.elink.esua.epdc.volunteer.*;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -63,6 +62,9 @@ public class VolunteerServiceImpl extends BaseServiceImpl<VolunteerDao, Voluntee
     @Autowired
     private VolunteerOrgRelationDao volunteerOrgRelationDao;
 
+    @Autowired
+    private VolunteerOrgDao volunteerOrgDao;
+
     @Override
     public PageData<VolunteerDTO> page(Map<String, Object> params) {
         IPage<VolunteerEntity> page = baseDao.selectPage(
@@ -121,6 +123,35 @@ public class VolunteerServiceImpl extends BaseServiceImpl<VolunteerDao, Voluntee
         return new Result().ok(result);
     }
 
+    @Override
+    public Result getOrgTypeList(AppVorgFormDTO formDto) {
+        List<OrgTypeListResultDTO> result = volunteerOrgDao.getOrgTypeList();
+        return new Result().ok(result);
+    }
+
+    @Override
+    public Result getOrgListByType(AppVorgFormDTO formDto) {
+        int pageIndex = (formDto.getPageIndex() - NumConstant.ONE) * formDto.getPageSize();
+        formDto.setPageIndex(pageIndex);
+        List<OrgListByTypeResultDTO> result = volunteerOrgDao.getOrgListByType(formDto);
+        return new Result().ok(result);
+    }
+
+    @Override
+    public Result getOrgDetail(AppVorgFormDTO formDto) {
+        return null;
+    }
+
+    @Override
+    public Result getOrgDetailList(AppVorgFormDTO formDto) {
+        return null;
+    }
+
+    @Override
+    public Result getVolunteerList(AppVorgFormDTO formDto) {
+        return null;
+    }
+
     @Override
     public List<VolunteerDTO> list(Map<String, Object> params) {
         List<VolunteerEntity> entityList = baseDao.selectList(getWrapper(params));

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

@@ -112,6 +112,19 @@
         where USER_ID=#{userId}
                     and v.DEL_FLAG='0'
     </select>
+    <select id="getByUserIdAndOrgId" resultType="com.elink.esua.epdc.modules.volunteer.entity.VolunteerEntity">
+        SELECT *
+        FROM `epdc_volunteer`
+        where DEL_FLAG='0'
+                    and VOLUNTEER_ORG_ID=#{orgId}
+                    and USER_ID=#{userId}
+    </select>
+    <update id="updateAdminUser">
+        update `epdc_volunteer` set ADMIN_FLAG='0'
+        where DEL_FLAG='0'
+			and VOLUNTEER_ORG_ID=#{orgId}
+			and ADMIN_FLAG='1'
+    </update>
 
 
 </mapper>

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

@@ -33,8 +33,8 @@
                 v.*
         from epdc_volunteer_org v
         left join epdc_vact_org_type ot on ot.id=v.org_type
-        left join epdc_volunteer_org_relation r on r.VOLUNTEER_ORG_ID=v.id
-                  and r.admin_flag=1 and r.DEL_FLAG='0'
+        left join epdc_volunteer r on r.VOLUNTEER_ORG_ID=v.id
+                    and r.admin_flag=1 and r.DEL_FLAG='0'
         where   v.del_flag='0'
                 <if test="volunteerOrgName != null and volunteerOrgName!=''">
                     and v.volunteer_org_name like '%${volunteerOrgName}%'
@@ -62,6 +62,37 @@
               AND is_open='0'
         order by sort ASC
     </select>
+    <select id="getOrgTypeList" resultType="com.elink.esua.epdc.volunteer.OrgTypeListResultDTO">
+        select id,
+		   type_name
+        from epdc_vact_org_type
+        where del_flag='0'
+        order by create_date desc
+    </select>
+    <select id="getOrgListByType" resultType="com.elink.esua.epdc.volunteer.OrgListByTypeResultDTO">
+        select o.id,
+		       o.volunteer_org_name,
+			   o.img_url,
+			   ifnull(vo.userCount,0) as userCount,
+			   ifnull(vi.activityCount,0) as activityCount
+        from epdc_volunteer_org o
+        left join (select VOLUNTEER_ORG_ID,count(id) as userCount
+                                from epdc_volunteer_org_relation
+                                where del_flag='0'
+                                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
+                            inner join epdc_vact_info v on v.id=r.VACT_ID and v.del_flag='0' and v.STATE='15'
+                            where r.del_flag='0'
+                            group by VOLUNTEER_ORG_ID)vi on vi.VOLUNTEER_ORG_ID=o.id
+        where o.del_flag='0'
+              and o.org_type=#{typeId}
+              and o.is_open='0'
+        order by o.create_date desc
+    </select>
+    <select id="getByTypeId" resultType="com.elink.esua.epdc.modules.volunteer.entity.VolunteerOrgEntity">
+        select * from epdc_volunteer_org where del_flag='0' and org_type=#{typeId}
+    </select>
 
 
 </mapper>