From 07c7f39a97f4ea8f84d32e2e2075dfc9d6a1dd04 Mon Sep 17 00:00:00 2001
From: 张天森 <1292933220@qq.com>
Date: 星期一, 24 十月 2022 18:14:14 +0800
Subject: [PATCH] Merge branch 'huacheng_test' into haucheng_panzhihua
---
flower_city/src/main/java/com/dg/core/db/gen/mapper/OrganizationChartMapper.java | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/flower_city/src/main/java/com/dg/core/db/gen/mapper/OrganizationChartMapper.java b/flower_city/src/main/java/com/dg/core/db/gen/mapper/OrganizationChartMapper.java
index 679fbce..cfdd1e5 100644
--- a/flower_city/src/main/java/com/dg/core/db/gen/mapper/OrganizationChartMapper.java
+++ b/flower_city/src/main/java/com/dg/core/db/gen/mapper/OrganizationChartMapper.java
@@ -14,7 +14,8 @@
* 查询机构列表
*/
public List<OrganizationChartEntity> selectConfigList(@Param("parentId") String parentId,
- @Param("grade") String grade);
+ @Param("grade") String grade,
+ @Param("ids") List<String> ids);
/**
* 新增机构
@@ -50,13 +51,14 @@
/**
* 查询机构列表(分页)
*/
- List<OrganizationChartEntity> queryList(IPage<OrganizationChartEntity> page, Integer state, String organizationName);
+ List<OrganizationChartEntity> queryList(IPage<OrganizationChartEntity> page, Integer state,
+ @Param("organizationName") String organizationName,@Param("ids") List<String> ids);
/**
* 统计数量(部门应用)
*/
- int countList(String organizationName);
+ int countList(@Param("organizationName") String organizationName,@Param("ids") List<String> ids);
/**
--
Gitblit v1.7.1