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 | 70 +++++++++++++++++++++++++++++++++--
1 files changed, 66 insertions(+), 4 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 c06ddb6..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
@@ -8,6 +8,7 @@
import com.dg.core.service.IOrganizationChartService;
import org.springframework.stereotype.Service;
+import java.util.ArrayList;
import java.util.List;
@Service
@@ -79,12 +80,73 @@
}
@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);
}
+
+
+ @Override
+ public List<OrganizationChartEntity> selectParentList(String parentId, String grade) {
+ return baseMapper.selectConfigList(parentId,grade);
+ }
+
+ /**
+ * 递归获取id 内部使用
+ * @param id
+ * @return
+ */
+
+ @Override
+ public List<String> getIds(String id)
+ {
+ List<String> ids=new ArrayList<>();
+ List<OrganizationChartEntity> lists = baseMapper.selectConfigList(id,"");
+ if(lists.size()<1)
+ {
+ lists.add(baseMapper.selectConfigById(id));
+ }
+ ids=disposestreetId(lists);
+ if(ids.size()<1)
+ {
+ return null;
+ }
+ ids.add(id);
+ return ids;
+ }
+
+
+
+ //递归取id
+ private List<String> disposestreetId(List<OrganizationChartEntity> lists)
+ {
+ List<String> ids=new ArrayList<>();
+ if(lists==null || lists.size()<1)
+ {
+ return ids;
+ }
+
+ for (OrganizationChartEntity sysStreet:lists)
+ {
+ if(sysStreet!=null&&sysStreet.getId()!=null)
+ {
+ if(sysStreet.getChild()!=null && sysStreet.getChild().size()>0)
+ {
+ ids.addAll(disposestreetId(sysStreet.getChild()));
+ }
+ else
+ {
+ ids.add(sysStreet.getId()+"");
+ }
+ }
+ }
+ return ids;
+ }
+
+
}
--
Gitblit v1.7.1