From 4d968c0ceb43dcbbc1c4226db163cb5618b3cf33 Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期二, 11 十月 2022 15:01:07 +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 | 28 +++++++++++++++++-----------
1 files changed, 17 insertions(+), 11 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 ef7297f..377770b 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
@@ -89,9 +89,15 @@
return baseMapper.countList(organizationName);
}
+
+ @Override
+ public List<OrganizationChartEntity> selectParentList(String parentId, String grade) {
+ return baseMapper.selectConfigList(parentId,grade);
+ }
+
/**
* 递归获取id 内部使用
- * @param departmentId
+ * @param id
* @return
*/
@@ -113,10 +119,7 @@
return ids;
}
- @Override
- public List<OrganizationChartEntity> selectParentList(String parentId, String grade) {
- return baseMapper.selectConfigList(parentId,grade);
- }
+
//递归取id
private List<String> disposestreetId(List<OrganizationChartEntity> lists)
@@ -129,14 +132,17 @@
for (OrganizationChartEntity sysStreet:lists)
{
- ids.add(sysStreet.getId()+"");
- if(sysStreet.getChild()!=null && sysStreet.getChild().size()>0)
- {
- ids.addAll(disposestreetId(sysStreet.getChild()));
- }
- else
+ if(sysStreet!=null&&sysStreet.getId()!=null)
{
ids.add(sysStreet.getId()+"");
+ if(sysStreet.getChild()!=null && sysStreet.getChild().size()>0)
+ {
+ ids.addAll(disposestreetId(sysStreet.getChild()));
+ }
+ else
+ {
+ ids.add(sysStreet.getId()+"");
+ }
}
}
return ids;
--
Gitblit v1.7.1