From 1de0a85c067ceb62413d0f458899dca41b8322d0 Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期四, 17 十一月 2022 17:07:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test
---
flower_city/src/main/java/com/dg/core/service/IOrganizationChartService.java | 29 ++++++++++++++++++++++++++---
1 files changed, 26 insertions(+), 3 deletions(-)
diff --git a/flower_city/src/main/java/com/dg/core/service/IOrganizationChartService.java b/flower_city/src/main/java/com/dg/core/service/IOrganizationChartService.java
index a56ce74..b2208a1 100644
--- a/flower_city/src/main/java/com/dg/core/service/IOrganizationChartService.java
+++ b/flower_city/src/main/java/com/dg/core/service/IOrganizationChartService.java
@@ -10,7 +10,7 @@
/**
* 查询机构列表
*/
- public List<OrganizationChartEntity> selectConfigList(String parentId,String grade);
+ public List<OrganizationChartEntity> selectConfigList(String parentId,String grade,List<String> ids);
/**
* 新增机构
@@ -46,12 +46,35 @@
/**
* 查询机构列表(分页)
*/
- List<OrganizationChartEntity> queryList(IPage<OrganizationChartEntity> page, Integer state, String organizationName);
+ List<OrganizationChartEntity> queryList(IPage<OrganizationChartEntity> page, Integer state, String organizationName,List<String> ids);
/**
* 统计数量(部门应用)
*/
- int countList(String organizationName);
+ int countList(String organizationName,List<String> ids);
+
+ /**
+ * 获取部门下子部门的全部id
+ * @param id
+ * @return
+ */
+ List<String> getIds(String id);
+
+
+ /**
+ * 根据id 查询是否有子部门
+ * @param parentId
+ * @param grade
+ * @return
+ */
+ public List<OrganizationChartEntity> selectParentList(String parentId,String grade);
+
+ /**
+ * 获取该部门所有上级部门及其所有下级部门
+ * @param id
+ * @return
+ */
+ List<String> getDepartmentId(String id);
}
--
Gitblit v1.7.1