From 70ab0655241881b2a917d0d44bdb7cd1ca27feb1 Mon Sep 17 00:00:00 2001 From: xiejunyu Date: Sat, 5 Mar 2022 20:43:41 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A0=87=E7=AD=BE=E6=96=B0=E5=A2=9E=E9=A1=B5-?= =?UTF-8?q?=E4=B8=AD=E8=8B=B1=E5=88=87=E6=8D=A2=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/SysCategoryController.java | 1 + .../service/impl/SysDictServiceImpl.java | 11 ++++++---- .../controller/OnlCgformAreaController.java | 2 +- .../tag/service/IOnlCgformAreaService.java | 2 +- .../impl/OnlCgformAreaServiceImpl.java | 20 ++++++++++--------- 5 files changed, 21 insertions(+), 15 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 c3c877bc2..37ebd4c8b 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 @@ -74,6 +74,7 @@ public class SysCategoryController { queryWrapper.eq("pid", sysCategory.getPid()); //--author:os_chengtgen---date:20190804 -----for: 分类字典页面显示错误,issues:377--------end + queryWrapper.eq("sys_dict_id",sysCategory.getSysDictId()); Page page = new Page(pageNo, pageSize); IPage pageList = sysCategoryService.page(page, queryWrapper); result.setSuccess(true); diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDictServiceImpl.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDictServiceImpl.java index f5ba13688..8f982f0f4 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDictServiceImpl.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDictServiceImpl.java @@ -197,13 +197,16 @@ public class SysDictServiceImpl extends ServiceImpl impl */ @Override public List queryDictName(String cut,SysDict sysDict) { - QueryWrapper QueryWrapper = new QueryWrapper<>(); + QueryWrapper queryWrapper = new QueryWrapper<>(); if (CutEnum.CN.getValue().equals(cut)) { - QueryWrapper.select("id", "dict_name", "attribute_type").eq("is_tag_dict", 1); + queryWrapper.select("id", "dict_name","dict_en_name", "attribute_type").eq("is_tag_dict", 1); }else{ - QueryWrapper.select("id", "dict_en_name", "attribute_type").eq("is_tag_dict", 1); + queryWrapper.select("id", "dict_name","dict_en_name", "attribute_type").eq("is_tag_dict", 1); + List resetlist = list(queryWrapper); + resetlist.stream().forEach(f->f.setDictName(f.getDictEnName())); + return resetlist; } - return list(QueryWrapper); + return list(queryWrapper); } /** diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/controller/OnlCgformAreaController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/controller/OnlCgformAreaController.java index 0cd9b4e23..79271b776 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/controller/OnlCgformAreaController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/controller/OnlCgformAreaController.java @@ -104,7 +104,7 @@ public class OnlCgformAreaController extends JeroController> queryShowArea(@RequestParam(name = "cut") String cut,OnlCgformArea onlCgformArea){ + public Result> queryShowArea(@RequestParam(name = "cut") String cut, OnlCgformArea onlCgformArea){ List list = onlCgformAreaService.queryShowArea(cut,onlCgformArea); return Result.OK(list); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/service/IOnlCgformAreaService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/service/IOnlCgformAreaService.java index 2794bd747..f86bd0626 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/service/IOnlCgformAreaService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/service/IOnlCgformAreaService.java @@ -66,7 +66,7 @@ public interface IOnlCgformAreaService extends IService { * * @return */ - List queryShowArea(String cut,OnlCgformArea onlCgformArea); + List queryShowArea(String cut, OnlCgformArea onlCgformArea); /** * 展示区域查询 diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/service/impl/OnlCgformAreaServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/service/impl/OnlCgformAreaServiceImpl.java index 796194fb1..3d541057b 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/service/impl/OnlCgformAreaServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/service/impl/OnlCgformAreaServiceImpl.java @@ -109,16 +109,18 @@ public class OnlCgformAreaServiceImpl extends ServiceImpl queryShowArea(String cut,OnlCgformArea onlCgformArea) { - QueryWrapper QueryWrapper = new QueryWrapper<>(); - if(StringUtils.isNotBlank(onlCgformArea.getIsModel())){ - if (CutEnum.CN.getValue().equals(cut)) { - QueryWrapper.select("id","show_area").orderByAsc("sort"); - }else{ - QueryWrapper.select("id","en_name").orderByAsc("sort"); - } + public List queryShowArea(String cut, OnlCgformArea onlCgformArea) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + if (CutEnum.CN.getValue().equals(cut)) { + queryWrapper.select("id","show_area").orderByAsc("sort"); + System.out.println("QueryWrapper数据:"+queryWrapper); + return list(queryWrapper); + }else{ + queryWrapper.select("id","en_name").orderByAsc("sort"); + List resetlist = list(queryWrapper); + resetlist.stream().forEach(f->f.setShowArea(f.getEnName())); + return resetlist; } - return list(QueryWrapper); } /**