From 5f6cb2554447c1103147675789effec004e28049 Mon Sep 17 00:00:00 2001
From: fengjin <1435304038@qq.com>
Date: 星期二, 15 十一月 2022 16:08:10 +0800
Subject: [PATCH] Merge branch 'zigonggao_dev' into huacheng_test
---
flower_city/src/main/java/com/dg/core/db/gen/mapper/OrganizationChartMapper.java | 10 ++++++----
1 files changed, 6 insertions(+), 4 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 dcceb35..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,19 +51,20 @@
/**
* 查询机构列表(分页)
*/
- 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);
/**
* 根据所属地区查找部门
*/
- List<OrganizationChartEntity> selectByCode(@Param("areaCode") String areaCode);
+ List<OrganizationChartEntity> selectByCode(@Param("id")String id, @Param("areaCode") String areaCode);
--
Gitblit v1.7.1