From 78173e8d7bda1d11d443743bd7c5705a02dccd50 Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期三, 26 十月 2022 13:11:56 +0800
Subject: [PATCH] 修改办理事项办结数量显示错误 bug
---
flower_city/src/main/java/com/dg/core/controller/OrganizationController.java | 21 ++++++++++++++++++---
1 files changed, 18 insertions(+), 3 deletions(-)
diff --git a/flower_city/src/main/java/com/dg/core/controller/OrganizationController.java b/flower_city/src/main/java/com/dg/core/controller/OrganizationController.java
index 5524fdb..c55fa12 100644
--- a/flower_city/src/main/java/com/dg/core/controller/OrganizationController.java
+++ b/flower_city/src/main/java/com/dg/core/controller/OrganizationController.java
@@ -54,7 +54,7 @@
@Authorization
public TableDataInfo selectJurisdiction(@CurrentUser SysUser sysUser)
{
- return getOrganizations(sysUser.getDepartmentId());
+ return getDataTable(iOrganizationChartService.selectConfigList(sysUser.getDepartmentId(),"",null));
}
/**
@@ -172,7 +172,17 @@
public TableDataInfo getOrganizations(@RequestParam(value = "department",required = false) String departmentId)
{
List<OrganizationChartEntity> ids=new ArrayList<>();
- List<OrganizationChartEntity> lists = iOrganizationChartService.selectParentList(departmentId,"");
+ List<OrganizationChartEntity> lists=null;
+ if(StringUtils.isEmpty(departmentId))
+ {
+ lists= iOrganizationChartService.selectParentList(null,"1");
+
+ }
+ else
+ {
+ lists= iOrganizationChartService.selectParentList(departmentId,null);
+ }
+
if(lists.size()<1)
{
lists.add(iOrganizationChartService.selectConfigById(departmentId));
@@ -182,7 +192,12 @@
{
return null;
}
- ids.add(iOrganizationChartService.selectConfigById(departmentId));
+
+ if(!StringUtils.isEmpty(departmentId))
+ {
+ ids.add(iOrganizationChartService.selectConfigById(departmentId));
+ }
+
return getDataTable(ids);
}
--
Gitblit v1.7.1