From f1bcbc43e988d0d1a91bea66a9ebbf6d601e48c0 Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期四, 13 十月 2022 10:33:19 +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 | 31 +++++++++++++++++++++++--------
1 files changed, 23 insertions(+), 8 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 38ab575..0751fdc 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,20 +119,29 @@
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)
{
- ids.add(sysStreet.getId()+"");
- if(sysStreet.getChild()!=null && sysStreet.getChild().size()>0)
+ if(sysStreet!=null&&sysStreet.getId()!=null)
{
- ids.addAll(disposestreetId(sysStreet.getChild()));
- }
- else
- {
- 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