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/service/impl/OrganizationChartImpl.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/flower_city/src/main/java/com/dg/core/service/impl/OrganizationChartImpl.java b/flower_city/src/main/java/com/dg/core/service/impl/OrganizationChartImpl.java
index 377770b..1d3a243 100644
--- a/flower_city/src/main/java/com/dg/core/service/impl/OrganizationChartImpl.java
+++ b/flower_city/src/main/java/com/dg/core/service/impl/OrganizationChartImpl.java
@@ -80,13 +80,14 @@
}
@Override
- public List<OrganizationChartEntity> queryList(IPage<OrganizationChartEntity> page, Integer state, String organizationName) {
- return baseMapper.queryList(page,state,organizationName);
+ public List<OrganizationChartEntity> queryList(IPage<OrganizationChartEntity> page, Integer state,
+ String organizationName,List<String> ids) {
+ return baseMapper.queryList(page,state,organizationName,ids);
}
@Override
- public int countList(String organizationName) {
- return baseMapper.countList(organizationName);
+ public int countList(String organizationName,List<String> ids) {
+ return baseMapper.countList(organizationName,ids);
}
@@ -134,7 +135,6 @@
{
if(sysStreet!=null&&sysStreet.getId()!=null)
{
- ids.add(sysStreet.getId()+"");
if(sysStreet.getChild()!=null && sysStreet.getChild().size()>0)
{
ids.addAll(disposestreetId(sysStreet.getChild()));
--
Gitblit v1.7.1