From 7ba5730956fab5327b95110a8a70ff5ee025e35d Mon Sep 17 00:00:00 2001
From: fengjin <1435304038@qq.com>
Date: 星期一, 24 十月 2022 16:03:08 +0800
Subject: [PATCH] 放开短信测试
---
flower_city/src/main/java/com/dg/core/service/impl/OrganizationChartImpl.java | 50 ++++++++++++++++++++++++++++----------------------
1 files changed, 28 insertions(+), 22 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..02b9f5e 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
@@ -17,13 +17,13 @@
{
@Override
- public List<OrganizationChartEntity> selectConfigList(String parentId,String grade)
+ public List<OrganizationChartEntity> selectConfigList(String parentId,String grade,List<String> ids)
{
- List<OrganizationChartEntity> ocList=baseMapper.selectConfigList("","1");
+ List<OrganizationChartEntity> ocList=baseMapper.selectConfigList("","1",ids);
for (OrganizationChartEntity entity:ocList)
{
- entity.setChild(baseMapper.selectConfigList(entity.getId()+"",""));
+ entity.setChild(baseMapper.selectConfigList(entity.getId()+"","",ids));
if (entity.getChild()!=null)
{
@@ -57,9 +57,9 @@
public List<OrganizationChartEntity> selectConfigList(String parentsId) {
- List<OrganizationChartEntity> list =baseMapper.selectConfigList(parentsId,"");
+ List<OrganizationChartEntity> list =baseMapper.selectConfigList(parentsId,"",null);
for (OrganizationChartEntity sysStreet:list) {
- sysStreet.setChild(baseMapper.selectConfigList(sysStreet.getId().toString(),""));
+ sysStreet.setChild(baseMapper.selectConfigList(sysStreet.getId().toString(),"",null));
if (sysStreet.getChild()!=null)
{
sysStreet.setChild(this.selectConfigList(sysStreet.getId().toString()));
@@ -80,18 +80,25 @@
}
@Override
- public List<OrganizationChartEntity> queryList(IPage<OrganizationChartEntity> page, Integer state, String organizationName) {
- return baseMapper.queryList(page,state,organizationName);
+ public List<OrganizationChartEntity> queryList(IPage<OrganizationChartEntity> page, Integer state,
+ String organizationName,List<String> ids) {
+ return baseMapper.queryList(page,state,organizationName,ids);
}
@Override
- public int countList(String organizationName) {
- return baseMapper.countList(organizationName);
+ public int countList(String organizationName,List<String> ids) {
+ return baseMapper.countList(organizationName,ids);
+ }
+
+
+ @Override
+ public List<OrganizationChartEntity> selectParentList(String parentId, String grade) {
+ return baseMapper.selectConfigList(parentId,grade,null);
}
/**
* 递归获取id 内部使用
- * @param departmentId
+ * @param id
* @return
*/
@@ -99,7 +106,7 @@
public List<String> getIds(String id)
{
List<String> ids=new ArrayList<>();
- List<OrganizationChartEntity> lists = baseMapper.selectConfigList(id,"");
+ List<OrganizationChartEntity> lists = baseMapper.selectConfigList(id,"",null);
if(lists.size()<1)
{
lists.add(baseMapper.selectConfigById(id));
@@ -113,10 +120,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 +133,16 @@
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