From 0de88063b90843a864b36647aeed8d4195f092c2 Mon Sep 17 00:00:00 2001 From: xiejunyu Date: Wed, 25 May 2022 20:10:59 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A0=91=E5=BD=A2=E7=88=B6=E7=BA=A7=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/system/controller/SysCategoryController.java | 5 ++--- .../jero/modules/system/service/ISysCategoryService.java | 2 +- .../modules/system/service/impl/SysCategoryServiceImpl.java | 6 ++++-- 3 files changed, 7 insertions(+), 6 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 659e28fe9..177cc374b 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 @@ -28,7 +28,6 @@ import org.jeecgframework.poi.excel.entity.ExportParams; import org.jeecgframework.poi.excel.entity.ImportParams; import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartHttpServletRequest; @@ -100,8 +99,8 @@ public class SysCategoryController { @AutoLog(value = "标签内容-查询字典配置的父级名称") @ApiOperation(value = "标签内容-查询字典配置的父级名称", notes = "标签内容-查询字典配置的父级名称") @GetMapping(value = "/queryPid") - public Result> queryPid() { - List list = sysCategoryService.queryPid(); + public Result> queryPid(SysCategory sysCategory) { + List list = sysCategoryService.queryPid(sysCategory); return Result.OK(list); } 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 793ced8fe..1cb646f44 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 @@ -90,5 +90,5 @@ public interface ISysCategoryService extends IService { void setEditOrderNum(SysCategory sysCategory); - List queryPid(); + List queryPid(SysCategory sysCategory); } 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 d060ca6d6..f66abd579 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 @@ -387,9 +387,11 @@ public class SysCategoryServiceImpl extends ServiceImpl queryPid() { + public List queryPid(SysCategory sysCategory) { QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("pid",0); + queryWrapper.eq("sys_dict_id",sysCategory.getSysDictId()) + .eq("pid",0) + .orderByDesc("sort_order"); List list = list(queryWrapper); return list; }