From 2c2994b7a998a9b324d96e4a6e19a42b35db88f8 Mon Sep 17 00:00:00 2001
From: fengjin <1435304038@qq.com>
Date: 星期三, 02 十一月 2022 15:18:44 +0800
Subject: [PATCH] Merge branch 'huacheng_test' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into huacheng_test
---
flower_city/src/main/java/com/dg/core/service/IOrganizationChartService.java | 22 +++++++++++++++++++---
1 files changed, 19 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..990a9a5 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,28 @@
/**
* 查询机构列表(分页)
*/
- 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);
}
--
Gitblit v1.7.1