From f3cf90bd28acd6b49d656c9f8c4188254fc3d858 Mon Sep 17 00:00:00 2001 From: JEECG <445654970@qq.com> Date: Mon, 25 Mar 2024 09:42:33 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9C=A8=E7=A7=9F=E6=88=B7=E4=B8=8D=E9=9A=94?= =?UTF-8?q?=E7=A6=BB=E7=9A=84=E6=83=85=E5=86=B5=E4=B8=8B=E5=AF=BC=E5=87=BA?= =?UTF-8?q?=E9=83=A8=E9=97=A8=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jeecg/modules/system/controller/SysDepartController.java | 3 ++- .../org/jeecg/modules/system/service/ISysDepartService.java | 2 +- .../modules/system/service/impl/SysDepartServiceImpl.java | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysDepartController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysDepartController.java index a529ada6..f9fa6e41 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysDepartController.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysDepartController.java @@ -365,7 +365,8 @@ public class SysDepartController { //} //}); //step.2 组装导出数据 - List sysDepartExportVos = sysDepartService.getExportDepart(sysDepart.getTenantId()); + Integer tenantId = sysDepart == null ? null : sysDepart.getTenantId(); + List sysDepartExportVos = sysDepartService.getExportDepart(tenantId); //导出文件名称 mv.addObject(NormalExcelConstants.FILE_NAME, "部门列表"); mv.addObject(NormalExcelConstants.CLASS, SysDepartExportVo.class); diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysDepartService.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysDepartService.java index a22273ed..04caf35e 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysDepartService.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysDepartService.java @@ -223,7 +223,7 @@ public interface ISysDepartService extends IService{ * @param tenantId * @return */ - List getExportDepart(int tenantId); + List getExportDepart(Integer tenantId); /** * 导出系统部门excel diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysDepartServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysDepartServiceImpl.java index 7c58ffc7..edbc814b 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysDepartServiceImpl.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysDepartServiceImpl.java @@ -1220,7 +1220,7 @@ public class SysDepartServiceImpl extends ServiceImpl getExportDepart(int tenantId) { + public List getExportDepart(Integer tenantId) { //获取父级部门 List parentDepart = departMapper.getSysDepartList("", tenantId); //子部门