YuNan
/
CET-cmd-2.0
forked from Big-Data-Lab/CET-cmd-2.0
1
0
Fork 0
Code Pull Requests Activity

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

This commit is contained in:
JEECG 2024-03-25 09:42:33 +08:00
parent 70847d17f1
commit f3cf90bd28
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysDepartController.java
View File

@ -365,7 +365,8 @@ public class SysDepartController {
//} //}
//}); //});
//step.2 组装导出数据 //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.FILE_NAME, "部门列表");
mv.addObject(NormalExcelConstants.CLASS, SysDepartExportVo.class); mv.addObject(NormalExcelConstants.CLASS, SysDepartExportVo.class);

2
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysDepartService.java
View File

@ -223,7 +223,7 @@ public interface ISysDepartService extends IService<SysDepart>{
* @param tenantId * @param tenantId
* @return * @return
*/ */
List<SysDepartExportVo> getExportDepart(int tenantId); List<SysDepartExportVo> getExportDepart(Integer tenantId);
/** /**
* 导出系统部门excel * 导出系统部门excel

2
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysDepartServiceImpl.java
View File

@ -1220,7 +1220,7 @@ public class SysDepartServiceImpl extends ServiceImpl<SysDepartMapper, SysDepart
* @return * @return
*/ */
@Override @Override
public List<SysDepartExportVo> getExportDepart(int tenantId) { public List<SysDepartExportVo> getExportDepart(Integer tenantId) {
//获取父级部门 //获取父级部门
List<SysDepartExportVo> parentDepart = departMapper.getSysDepartList("", tenantId); List<SysDepartExportVo> parentDepart = departMapper.getSysDepartList("", tenantId);
//子部门 //子部门