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) {