From 2e5ffea1fc7263fff8e3b6a87707233597c07c8f Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期二, 11 十月 2022 09:23:04 +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, 10 insertions(+), 0 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..ef7297f 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
@@ -113,10 +113,20 @@
         return ids;
     }
 
+    @Override
+    public List<OrganizationChartEntity> selectParentList(String parentId, String grade) {
+        return baseMapper.selectConfigList(parentId,grade);
+    }
+
     //递归取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()+"");

--
Gitblit v1.7.1