在租户不隔离的情况下导出部门报错

jeecgboot · Mar 25, 2024 · f3cf90b · f3cf90b
1 parent 70847d1
commit f3cf90b
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/...ecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysDepartController.java b/...ecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysDepartController.java
@@ -365,7 +365,8 @@ public ModelAndView exportXls(SysDepart sysDepart,HttpServletRequest request) {
 			//}
 		//});
 		//step.2 组装导出数据
-		List<SysDepartExportVo> sysDepartExportVos = sysDepartService.getExportDepart(sysDepart.getTenantId());
+		Integer tenantId = sysDepart == null ? null : sysDepart.getTenantId();
+		List<SysDepartExportVo> sysDepartExportVos = sysDepartService.getExportDepart(tenantId);
         //导出文件名称
         mv.addObject(NormalExcelConstants.FILE_NAME, "部门列表");
         mv.addObject(NormalExcelConstants.CLASS, SysDepartExportVo.class);

diff --git a/...em/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysDepartService.java b/...em/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysDepartService.java
@@ -223,7 +223,7 @@ public interface ISysDepartService extends IService<SysDepart>{
      * @param tenantId
      * @return
      */
-    List<SysDepartExportVo> getExportDepart(int tenantId);
+    List<SysDepartExportVo> getExportDepart(Integer tenantId);
 
     /**
      * 导出系统部门excel

diff --git a/...-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysDepartServiceImpl.java b/...-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysDepartServiceImpl.java
@@ -1220,7 +1220,7 @@ private void setParentDepartIzLeaf(List<String> parentIdList) {
 	 * @return
 	 */
 	@Override
-	public List<SysDepartExportVo> getExportDepart(int tenantId) {
+	public List<SysDepartExportVo> getExportDepart(Integer tenantId) {
 		//获取父级部门
 		List<SysDepartExportVo> parentDepart = departMapper.getSysDepartList("", tenantId);
 		//子部门