From f40fe15033bc21b05ce626160e623af06bdf8b83 Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期一, 24 十月 2022 14:39:59 +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 | 7 ++++---
1 files changed, 4 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 dcceb35..8a0a03b 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
@@ -50,19 +50,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