From 186cb4b91cc2f4f0bc4e768e42ee98ef09807618 Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期二, 06 十二月 2022 13:25:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test
---
flower_city/src/main/java/com/dg/core/db/gen/mapper/OrganizationChartMapper.java | 14 +++++++++++---
1 files changed, 11 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 2cce0ad..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,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("id")String id, @Param("areaCode") String areaCode);
--
Gitblit v1.7.1