diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysCategoryController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysCategoryController.java index 44315f428..8d2e852d0 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysCategoryController.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysCategoryController.java @@ -564,7 +564,11 @@ public class SysCategoryController { } } - @GetMapping("/getSysCategoryTree") + /** + * 只查询技术领域的树形数据字典 + * @return + */ + @GetMapping("/getSysCategoryTree") public Result getSysCategoryTree() { return Result.OK(sysCategoryService.getSysCategoryTree()); } diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysCategoryServiceImpl.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysCategoryServiceImpl.java index 73baf4f08..043b84843 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysCategoryServiceImpl.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysCategoryServiceImpl.java @@ -1,5 +1,6 @@ package com.jero.modules.system.service.impl; +import cn.hutool.core.util.ObjectUtil; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -42,6 +43,23 @@ public class SysCategoryServiceImpl extends ServiceImpl getParentPath(SysCategory sysCategory){ + List nameList = new ArrayList<>(); + nameList.add(sysCategory.getName()); + getParent(sysCategory, nameList); + return nameList; + } + + private List getParent(SysCategory sysCategory, List nameList){ + SysCategory parent = sysCategoryMapper.selectById(sysCategory.getPid()); + if(ObjectUtil.isNotEmpty(parent)){ + nameList.add(parent.getName()); + } + if(!"0".equals(sysCategory.getPid())){ + getParent(parent, nameList); + } + return nameList; + } @Override public void addSysCategory(SysCategory sysCategory) { String categoryCode = ""; diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectLibraryBaseMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectLibraryBaseMapper.xml index 557f6d96f..7bafdf9c5 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectLibraryBaseMapper.xml +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectLibraryBaseMapper.xml @@ -20,6 +20,8 @@ + +