diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/TbFloorController.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/TbFloorController.java index b9b6070..fa43aa3 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/TbFloorController.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/TbFloorController.java @@ -65,7 +65,7 @@ public class TbFloorController extends BaseController { @SaCheckPermission("property:floor:query") @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") - @PathVariable("id") Long id) { + @PathVariable("id") Long id) { return R.ok(tbFloorService.queryById(id)); } @@ -103,4 +103,16 @@ public class TbFloorController extends BaseController { @PathVariable("ids") Long[] ids) { return toAjax(tbFloorService.deleteWithValidByIds(List.of(ids), true)); } + + /** + * 根据单元ID查询楼层 + * + * @param unitId 单元ID + * @return 楼层 + */ + @GetMapping("/queryByUnitId/{unitId}") + public R> queryByUnitId(@NotNull(message = "单元ID不能为空") + @PathVariable("unitId") Long unitId) { + return R.ok(tbFloorService.queryByUnitId(unitId)); + } } diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/TbFloorServiceImpl.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/TbFloorServiceImpl.java index 28630af..e7a4794 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/TbFloorServiceImpl.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/TbFloorServiceImpl.java @@ -164,9 +164,10 @@ public class TbFloorServiceImpl implements ITbFloorService { * @return 楼层 */ @Override - public List queryByUnitId(Long unitId){ + public List queryByUnitId(Long unitId) { LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); - lqw.eq(TbFloor::getUnitId, unitId); + lqw.eq(TbFloor::getUnitId, unitId) + .orderByAsc(TbFloor::getFloorNumber); return baseMapper.selectVoList(lqw); } }