From 7044df54b1809b1b09e8f20cdf9aef653f9ed12a Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期四, 27 十月 2022 11:02:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/haucheng_panzhihua' into haucheng_panzhihua
---
flower_city/src/main/java/com/dg/core/service/IOrganizationChartService.java | 6 +++---
1 files changed, 3 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 6bf74b7..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,13 +46,13 @@
/**
* 查询机构列表(分页)
*/
- 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
--
Gitblit v1.7.1