From 97e656bfdbd32d8b72a1cc5b326bb979e974c55a Mon Sep 17 00:00:00 2001 From: Jackwang Date: Fri, 10 Jun 2022 14:39:58 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=90=9C=E7=B4=A2=E5=85=9A?= =?UTF-8?q?=E7=BB=84=E7=BB=87=E6=A0=91(=E4=B8=8D=E5=8C=85=E5=90=AB?= =?UTF-8?q?=E5=BD=93=E5=89=8D=E7=BA=A7=E7=BB=84=E7=BB=87)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/IcPartyOrgController.java | 13 +++++++++ .../modules/partyOrg/dao/IcPartyOrgDao.java | 12 ++++++-- .../partyOrg/service/IcPartyOrgService.java | 9 ++++++ .../service/impl/IcPartyOrgServiceImpl.java | 6 ++++ .../mapper/partyOrg/IcPartyOrgDao.xml | 28 +++++++++++++++++++ 5 files changed, 66 insertions(+), 2 deletions(-) diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyOrgController.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyOrgController.java index c0b0af1144..1d5cbcda24 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyOrgController.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyOrgController.java @@ -96,6 +96,19 @@ public class IcPartyOrgController { return icPartyOrgService.getTreelist(formDTO); } + /** + * @describe: 列表搜索党组织树(不包含当前级组织) + * @author wangtong + * @date 2022/6/10 14:20 + * @params [tokenDto, formDTO] + * @return com.epmet.commons.tools.utils.Result> + */ + @GetMapping("getSearchTreelist") + public Result> getSearchTreelist(@LoginUser TokenDto tokenDto,PartyOrgTreeListDTO formDTO){ + formDTO.setCustomerId(tokenDto.getCustomerId()); + return icPartyOrgService.getSearchTreelist(formDTO); + } + /** * @describe: 当前登录用户所属行政组织，及下级的党组织（只限支部） * @author wangtong diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyOrgDao.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyOrgDao.java index 3413e87649..49574a4af6 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyOrgDao.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyOrgDao.java @@ -3,7 +3,6 @@ package com.epmet.modules.partyOrg.dao; import com.epmet.commons.mybatis.dao.BaseDao; import com.epmet.modules.partyOrg.entity.IcPartyOrgEntity; import com.epmet.resi.partymember.dto.partyOrg.form.PartyOrgTreeListDTO; -import com.epmet.resi.partymember.dto.partyOrg.result.BranchlistTreeDTO; import com.epmet.resi.partymember.dto.partyOrg.result.BranchlistTreeSubDTO; import com.epmet.resi.partymember.dto.partyOrg.result.IcPartyOrgTreeDTO; import org.apache.ibatis.annotations.Mapper; @@ -21,7 +20,7 @@ import java.util.List; public interface IcPartyOrgDao extends BaseDao { /** - * @describe: 获取组织列表 + * @describe: 获取当前及下级组织列表 * @author wangtong * @date 2022/5/17 19:00 * @params [] @@ -75,4 +74,13 @@ public interface IcPartyOrgDao extends BaseDao { * @return java.util.List */ List selectAllBranchByAgencyId(@Param("agencyId") String agencyId, @Param("customerId") String customerId); + + /** + * @describe: 获取下级组织列表 + * @author wangtong + * @date 2022/6/10 14:21 + * @params [formDTO] + * @return java.util.List + */ + List getSearchTreelist(PartyOrgTreeListDTO formDTO); } diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyOrgService.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyOrgService.java index 5405a5b531..7e1b6ad24c 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyOrgService.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyOrgService.java @@ -98,4 +98,13 @@ public interface IcPartyOrgService extends BaseService { * @return com.epmet.commons.tools.utils.Result */ Result> branchlist(TokenDto tokenDto); + + /** + * @describe: 列表搜索党组织树(不包含当前级组织) + * @author wangtong + * @date 2022/6/10 14:20 + * @params [formDTO] + * @return com.epmet.commons.tools.utils.Result> + */ + Result> getSearchTreelist(PartyOrgTreeListDTO formDTO); } diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyOrgServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyOrgServiceImpl.java index 789d94bbca..e0105c65fe 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyOrgServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyOrgServiceImpl.java @@ -231,6 +231,12 @@ public class IcPartyOrgServiceImpl extends BaseServiceImpl>().ok(resultList); } + @Override + public Result> getSearchTreelist(PartyOrgTreeListDTO formDTO) { + List list = baseDao.getSearchTreelist(formDTO); + return new Result>().ok(build(list)); + } + /** * 构建树节点 */ diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyOrgDao.xml b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyOrgDao.xml index 34f4cc1a79..451da2c51a 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyOrgDao.xml +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyOrgDao.xml @@ -96,6 +96,34 @@ AND (AGENCY_ID = #{agencyId} or AGENCY_PIDS LIKE concat('%',#{agencyId}, '%' )) +