From 0f3db47c9a6c03611ac75118017f83d18ae062f2 Mon Sep 17 00:00:00 2001
From: 张天森 <1292933220@qq.com>
Date: 星期五, 25 十一月 2022 10:33:15 +0800
Subject: [PATCH] Merge branch 'huacheng_test' into haucheng_panzhihua
---
flower_city/src/main/java/com/dg/core/service/impl/OrganizationChartImpl.java | 48 ++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 48 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 a2a27e6..04f1d01 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
@@ -42,6 +42,12 @@
}
@Override
+ public List<OrganizationChartEntity> selectConfigList(List<String> ids) {
+ List<OrganizationChartEntity> ocList=baseMapper.selectConfigList(null,null,ids);
+ return ocList;
+ }
+
+ @Override
public int insertConfig(OrganizationChartEntity entity) {
return baseMapper.insertConfig(entity);
}
@@ -141,6 +147,48 @@
return departmentIds;
}
+ @Override
+ public String getStairId(String id)
+ {
+ OrganizationChartEntity entity= baseMapper.selectConfigById(id);
+ if(entity!=null && StringUtils.isEmpty(entity.getParentId()))
+ {
+ return entity.getId()+"";
+ }
+ else
+ {
+ return getParentId(entity.getParentId());
+ }
+ }
+
+
+ /**
+ * 根据id 获取一级部门id 递归
+ * @param id
+ * @return
+ */
+ public String getParentId(String id)
+ {
+ String ultimatelyId;
+ OrganizationChartEntity entity= baseMapper.selectConfigById(id);
+ if(entity==null)
+ {
+ return id;
+ }
+
+ if(!StringUtils.isEmpty(entity.getParentId()))
+ {
+ ultimatelyId= getParentId(entity.getParentId());
+ return ultimatelyId;
+ }
+ else
+ {
+ ultimatelyId=entity.getId()+"";
+ return ultimatelyId;
+ }
+ }
+
+
public String parentId(String id){
String parentId=id;
--
Gitblit v1.7.1