From 0eb8d22f0e8d004b1e721cdd24b8e663bc80b6a2 Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期一, 24 十月 2022 16:18:23 +0800
Subject: [PATCH] 修改选择项部门权限显示 bug
---
flower_city/src/main/java/com/dg/core/service/impl/OrganizationChartImpl.java | 31 ++++++++++++++++++++-----------
1 files changed, 20 insertions(+), 11 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 0751fdc..a4b8ad2 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
@@ -6,6 +6,7 @@
import com.dg.core.db.gen.entity.OrganizationChartEntity;
import com.dg.core.db.gen.mapper.OrganizationChartMapper;
import com.dg.core.service.IOrganizationChartService;
+import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
@@ -17,13 +18,20 @@
{
@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(parentId,"1",ids);
+
+ if(ocList==null || ocList.size()<1)
+ {
+ List<String> id=new ArrayList<>();
+ id.add(parentId);
+ ocList=baseMapper.selectConfigList(null,null,id);
+ }
for (OrganizationChartEntity entity:ocList)
{
- entity.setChild(baseMapper.selectConfigList(entity.getId()+"",""));
+ entity.setChild(baseMapper.selectConfigList(entity.getId()+"","",null));
if (entity.getChild()!=null)
{
@@ -57,9 +65,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,19 +88,20 @@
}
@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);
+ return baseMapper.selectConfigList(parentId,grade,null);
}
/**
@@ -105,7 +114,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));
--
Gitblit v1.7.1