From b65ca78d880fb87d7ef1e592db2823b02a241830 Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Fri, 27 May 2022 11:39:53 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=A4=E4=BB=98=E7=89=A9=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=AD=97=E5=85=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/controller/SysCategoryController.java | 11 ++++++++++- .../modules/system/service/ISysCategoryService.java | 2 +- .../system/service/impl/SysCategoryServiceImpl.java | 10 ++++++++-- .../impl/BussDocumentLibraryEOServiceImpl.java | 8 ++++---- .../service/impl/FileSplitItemsEOServiceImpl.java | 2 +- 5 files changed, 24 insertions(+), 9 deletions(-) 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 177cc374b..3ccccf316 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 @@ -579,7 +579,16 @@ public class SysCategoryController { */ @GetMapping("/getSysCategoryTree") public Result getSysCategoryTree() { - return Result.OK(sysCategoryService.getSysCategoryTree()); + return Result.OK(sysCategoryService.getSysCategoryTree(null)); + } + /** + * 只查询交付物类型的树形数据字典 + * @return + */ + @GetMapping("/getDeliverableTree") + public Result getDeliverableTree() { + String flag = "deliverable_template"; + return Result.OK(sysCategoryService.getSysCategoryTree(flag)); } } diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysCategoryService.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysCategoryService.java index 1cb646f44..827bdc465 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysCategoryService.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysCategoryService.java @@ -67,7 +67,7 @@ public interface ISysCategoryService extends IService { * 获取树形结构 * @return */ - List getSysCategoryTree(); + List getSysCategoryTree(String flag); /** * 获取树形结构，中英文可切换 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 ed2fd62a5..7c2c307eb 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 @@ -264,10 +264,16 @@ public class SysCategoryServiceImpl extends ServiceImpl getSysCategoryTree() { + public List getSysCategoryTree(String flag) { try { //只查询技术领域的technology_territory - String dictId = sysCategoryMapper.getFieldInfo("technology_territory"); + String dictId = ""; + if("deliverable_template".equals(flag)){ + dictId = sysCategoryMapper.getFieldInfo("deliverable_template"); + }else{ + dictId = sysCategoryMapper.getFieldInfo("technology_territory"); + } + List list = new ArrayList<>(); if(StringUtils.isNotBlank(dictId)){ LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java index 1d45d2d59..a3d9b12cf 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java @@ -384,7 +384,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl sysCategoryTree = sysCategoryService.getSysCategoryTree(); + List sysCategoryTree = sysCategoryService.getSysCategoryTree(null); List> list = new ArrayList<>(); for (OnlCgformField onlCgformField : fieldList) { Map map = new HashMap<>(); @@ -430,7 +430,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl YesOrNoEnum.YES.getValue().equals(String.valueOf(e.getIsQuery()))).collect(Collectors.toList()); } //树形数据字典 - List sysCategoryTree = sysCategoryService.getSysCategoryTree(); + List sysCategoryTree = sysCategoryService.getSysCategoryTree(null); List> list = new ArrayList<>(); for (OnlCgformField onlCgformField : fieldList) { Map map = new HashMap<>(); @@ -561,7 +561,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl sysCategoryTree = sysCategoryService.getSysCategoryTree(); + List sysCategoryTree = sysCategoryService.getSysCategoryTree(null); // List> result = new ArrayList<>(); // for (OnlCgformArea onlCgformAreaTemp : areaList) { // String areaName = ""; @@ -654,7 +654,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl sysCategoryTree = sysCategoryService.getSysCategoryTree(); + List sysCategoryTree = sysCategoryService.getSysCategoryTree(null); List> result = new ArrayList<>(); for (OnlCgformArea onlCgformAreaTemp : areaList) { String areaName = ""; diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java index 985a4c945..46f2a675f 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java @@ -2808,7 +2808,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl YesOrNoEnum.YES.getValue().equals(String.valueOf(e.getIsQuery()))).collect(Collectors.toList()); } //树形数据字典 - List sysCategoryTree = sysCategoryService.getSysCategoryTree(); // 查询所有 并以树结构返回 + List sysCategoryTree = sysCategoryService.getSysCategoryTree(null); // 查询所有 并以树结构返回 List> list = new ArrayList<>(); for (OnlCgformField onlCgformField : fieldList) { Map map = new HashMap<>();