From 1ebbd7d5c83cc81e5cf94aa4d2a87a4ecd8a03c3 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期四, 03 三月 2022 10:04:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/ComPbOrgDAO.java |   23 ++++++++++++++++++++++-
 1 files changed, 22 insertions(+), 1 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/ComPbOrgDAO.java b/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/ComPbOrgDAO.java
index 7be167d..aae6e46 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/ComPbOrgDAO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/ComPbOrgDAO.java
@@ -10,6 +10,8 @@
 import com.panzhihua.common.model.vos.partybuilding.PartyOrganizationVO;
 import com.panzhihua.service_dangjian.model.dos.ComPbOrgDO;
 
+import java.util.List;
+
 /**
  * @program: springcloud_k8s_panzhihuazhihuishequ
  * @description: 党组织
@@ -19,8 +21,27 @@
 @Mapper
 public interface ComPbOrgDAO extends BaseMapper<ComPbOrgDO> {
 
-    @Select("select id,`name`,`status` from com_pb_org where community_id = ${partyOrganizationVO.communityId}")
+    /**
+     * 分页查询党组织列表
+     * @param page  分页参数
+     * @param partyOrganizationVO   请求参数
+     * @return  党组织列表
+     */
     IPage<PartyOrganizationVO> listPartyOrganizationAll(Page page,
         @Param("partyOrganizationVO") PartyOrganizationVO partyOrganizationVO);
 
+    /**
+     * 查询党组织下子组织列表
+     * @param partyOrganizationVO   请求参数
+     * @return  党组织下子组织列表
+     */
+    List<PartyOrganizationVO> getChildOrgList(@Param("partyOrganizationVO") PartyOrganizationVO partyOrganizationVO);
+
+    /**
+     * 查询1级党组织列表
+     * @param partyOrganizationVO   请求参数
+     * @return  1级党组织列表
+     */
+    List<PartyOrganizationVO> getPbOrgAllList(@Param("partyOrganizationVO") PartyOrganizationVO partyOrganizationVO);
+
 }

--
Gitblit v1.7.1