From 806bb6f25f1093a0b869f6aedb9b3e5e2e10edec Mon Sep 17 00:00:00 2001
From: Jackwang <wt373747285@163.com>
Date: Mon, 30 Aug 2021 10:05:50 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BF=97=E6=84=BF=E7=BB=84=E7=BB=87=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../volunteer/controller/VolunteerOrgController.java | 12 ++++++++++++
 .../epdc/modules/volunteer/dao/VolunteerOrgDao.java  |  9 +++++++++
 .../volunteer/service/VolunteerOrgService.java       |  9 +++++++++
 .../service/impl/VolunteerOrgServiceImpl.java        |  6 ++++++
 .../resources/mapper/volunteer/VolunteerOrgDao.xml   |  6 ++++++
 5 files changed, 42 insertions(+)

diff --git a/epdc-cloud-heart/src/main/java/com/elink/esua/epdc/modules/volunteer/controller/VolunteerOrgController.java b/epdc-cloud-heart/src/main/java/com/elink/esua/epdc/modules/volunteer/controller/VolunteerOrgController.java
index 1cab5ed..ec01f8c 100644
--- a/epdc-cloud-heart/src/main/java/com/elink/esua/epdc/modules/volunteer/controller/VolunteerOrgController.java
+++ b/epdc-cloud-heart/src/main/java/com/elink/esua/epdc/modules/volunteer/controller/VolunteerOrgController.java
@@ -107,4 +107,16 @@ public class VolunteerOrgController {
         return volunteerOrgService.getVolunteerOrgList();
     }
 
+    /**
+    * @describe: 小程序-组织列表
+    * @author wangtong
+    * @date 2021/8/30 9:49
+    * @params []
+    * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.volunteer.VolunteerOrgDTO>>
+    */
+    @GetMapping("getAppVolunteerOrgList")
+    public Result<List<VolunteerOrgDTO>> getAppVolunteerOrgList(){
+        return volunteerOrgService.getAppVolunteerOrgList();
+    }
+
 }
\ No newline at end of file
diff --git a/epdc-cloud-heart/src/main/java/com/elink/esua/epdc/modules/volunteer/dao/VolunteerOrgDao.java b/epdc-cloud-heart/src/main/java/com/elink/esua/epdc/modules/volunteer/dao/VolunteerOrgDao.java
index 3326a39..7d36324 100644
--- a/epdc-cloud-heart/src/main/java/com/elink/esua/epdc/modules/volunteer/dao/VolunteerOrgDao.java
+++ b/epdc-cloud-heart/src/main/java/com/elink/esua/epdc/modules/volunteer/dao/VolunteerOrgDao.java
@@ -61,4 +61,13 @@ public interface VolunteerOrgDao extends BaseDao<VolunteerOrgEntity> {
      * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.volunteer.VolunteerOrgDTO>>
      */
     List<VolunteerOrgDTO> getVolunteerOrgList();
+
+    /**
+    * @describe: 小程序-组织列表
+    * @author wangtong
+    * @date 2021/8/30 9:50
+    * @params []
+    * @return java.util.List<com.elink.esua.epdc.volunteer.VolunteerOrgDTO>
+    */
+    List<VolunteerOrgDTO> getAppVolunteerOrgList();
 }
\ No newline at end of file
diff --git a/epdc-cloud-heart/src/main/java/com/elink/esua/epdc/modules/volunteer/service/VolunteerOrgService.java b/epdc-cloud-heart/src/main/java/com/elink/esua/epdc/modules/volunteer/service/VolunteerOrgService.java
index 0d3bd2f..fa7d96a 100644
--- a/epdc-cloud-heart/src/main/java/com/elink/esua/epdc/modules/volunteer/service/VolunteerOrgService.java
+++ b/epdc-cloud-heart/src/main/java/com/elink/esua/epdc/modules/volunteer/service/VolunteerOrgService.java
@@ -103,4 +103,13 @@ public interface VolunteerOrgService extends BaseService<VolunteerOrgEntity> {
      * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.volunteer.VolunteerOrgDTO>>
      */
     Result<List<VolunteerOrgDTO>> getVolunteerOrgList();
+
+    /**
+     * @describe: 小程序-组织列表
+     * @author wangtong
+     * @date 2021/8/30 9:49
+     * @params []
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.volunteer.VolunteerOrgDTO>>
+     */
+    Result<List<VolunteerOrgDTO>> getAppVolunteerOrgList();
 }
\ No newline at end of file
diff --git a/epdc-cloud-heart/src/main/java/com/elink/esua/epdc/modules/volunteer/service/impl/VolunteerOrgServiceImpl.java b/epdc-cloud-heart/src/main/java/com/elink/esua/epdc/modules/volunteer/service/impl/VolunteerOrgServiceImpl.java
index 0ca07e9..c330991 100644
--- a/epdc-cloud-heart/src/main/java/com/elink/esua/epdc/modules/volunteer/service/impl/VolunteerOrgServiceImpl.java
+++ b/epdc-cloud-heart/src/main/java/com/elink/esua/epdc/modules/volunteer/service/impl/VolunteerOrgServiceImpl.java
@@ -121,4 +121,10 @@ public class VolunteerOrgServiceImpl extends BaseServiceImpl<VolunteerOrgDao, Vo
         return new Result<List<VolunteerOrgDTO>>().ok(result);
     }
 
+    @Override
+    public Result<List<VolunteerOrgDTO>> getAppVolunteerOrgList() {
+        List<VolunteerOrgDTO> result = baseDao.getAppVolunteerOrgList();
+        return new Result<List<VolunteerOrgDTO>>().ok(result);
+    }
+
 }
\ No newline at end of file
diff --git a/epdc-cloud-heart/src/main/resources/mapper/volunteer/VolunteerOrgDao.xml b/epdc-cloud-heart/src/main/resources/mapper/volunteer/VolunteerOrgDao.xml
index f8cb184..bad7c91 100644
--- a/epdc-cloud-heart/src/main/resources/mapper/volunteer/VolunteerOrgDao.xml
+++ b/epdc-cloud-heart/src/main/resources/mapper/volunteer/VolunteerOrgDao.xml
@@ -41,6 +41,12 @@
               AND is_open='0'
         order by sort ASC
     </select>
+    <select id="getAppVolunteerOrgList" resultType="com.elink.esua.epdc.volunteer.VolunteerOrgDTO">
+        select * from epdc_volunteer_org
+        where del_flag='0'
+              AND is_open='0'
+        order by sort ASC
+    </select>
 
 
 </mapper>
\ No newline at end of file