From 5f3cf501f9f6c216df17ee8af6618b55b537d21a Mon Sep 17 00:00:00 2001 From: yanghui <2536613402@qq.com> Date: 星期五, 21 十月 2022 16:57:54 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into local_20221014 --- flower_city/src/main/java/com/dg/core/service/impl/OrganizationChartImpl.java | 72 ++++++++++++++++++++++++++++++++++++ 1 files changed, 72 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 3b57e21..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 @@ -1,12 +1,14 @@ package com.dg.core.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.dg.core.db.gen.entity.OrganizationChartEntity; import com.dg.core.db.gen.mapper.OrganizationChartMapper; import com.dg.core.service.IOrganizationChartService; import org.springframework.stereotype.Service; +import java.util.ArrayList; import java.util.List; @Service @@ -76,4 +78,74 @@ public OrganizationChartEntity selectConfigById(String id) { return baseMapper.selectConfigById(id); } + + @Override + public List<OrganizationChartEntity> queryList(IPage<OrganizationChartEntity> page, Integer state, String organizationName) { + return baseMapper.queryList(page,state,organizationName); + } + + @Override + public int countList(String organizationName) { + return baseMapper.countList(organizationName); + } + + + @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