From 6fc0a3de36cae79c24e97ab618a5d3e040708f86 Mon Sep 17 00:00:00 2001 From: PIGCLOUD Date: Wed, 7 Jan 2026 13:01:12 +0800 Subject: [PATCH] =?UTF-8?q?feat(pigx-upms-biz):=20=E5=A2=9E=E5=BC=BA?= =?UTF-8?q?=E5=8C=BA=E5=9F=9F=E6=A0=91=E6=9F=A5=E8=AF=A2=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在 SysAreaServiceImpl 中添加 areaType 过滤条件 - 重构查询条件构建逻辑，使用 LambdaQueryWrapper - 保持原有 areaStatus 和 areaSort 排序条件 --- .../admin/service/impl/SysAreaServiceImpl.java | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysAreaServiceImpl.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysAreaServiceImpl.java index a50432004..1d3815fa7 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysAreaServiceImpl.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysAreaServiceImpl.java @@ -38,9 +38,18 @@ public class SysAreaServiceImpl extends ServiceImpl> selectTree(SysAreaEntity sysArea) { - List entityList = baseMapper.selectList(Wrappers.lambdaQuery(sysArea) - .eq(SysAreaEntity::getAreaStatus, YesNoEnum.YES.getCode()) - .orderByDesc(SysAreaEntity::getAreaSort)); + // 构建查询条件 + LambdaQueryWrapper wrapper = Wrappers.lambdaQuery(); + + // 添加 areaType 过滤：小于等于指定级别 + wrapper.le(StrUtil.isNotBlank(sysArea.getAreaType()), SysAreaEntity::getAreaType, sysArea.getAreaType()); + + // 保留原有条件 + wrapper.eq(SysAreaEntity::getAreaStatus, YesNoEnum.YES.getCode()) + .orderByDesc(SysAreaEntity::getAreaSort); + + // 执行查询 + List entityList = baseMapper.selectList(wrapper); List> nodeList = CollUtil.newArrayList(); for (SysAreaEntity sysAreaEntity : entityList) {