From 165e73d176191ae75b57c70e049c0cfd552bbdfa Mon Sep 17 00:00:00 2001 From: 无关风月 <443237572@qq.com> Date: 星期五, 11 七月 2025 21:27:37 +0800 Subject: [PATCH] 保洁巡检本周代码 --- ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TLocationTypeController.java | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TLocationTypeController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TLocationTypeController.java index 4daa2a5..d03e40f 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TLocationTypeController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TLocationTypeController.java @@ -6,8 +6,10 @@ import com.ruoyi.common.core.domain.R; import com.ruoyi.common.enums.BusinessType; import com.ruoyi.system.dto.LocationTypeDTO; +import com.ruoyi.system.model.TLocation; import com.ruoyi.system.model.TLocationType; import com.ruoyi.system.query.LocationTypeListQuery; +import com.ruoyi.system.service.TLocationService; import com.ruoyi.system.service.TLocationTypeService; import com.ruoyi.system.vo.system.LocationTypeListVO; import io.swagger.annotations.Api; @@ -31,6 +33,8 @@ public class TLocationTypeController { @Resource private TLocationTypeService locationTypeService; + @Resource + private TLocationService locationService; @ApiOperation(value = "点位类型分页列表") @PostMapping(value = "/pageList") public R<PageInfo<LocationTypeListVO>> pageList(@RequestBody LocationTypeListQuery query) { @@ -61,6 +65,10 @@ @DeleteMapping(value = "/delete") public R<Boolean> edit(@RequestParam String ids) { String[] split = ids.split(","); + Long count = locationService.lambdaQuery().in(TLocation::getLocationType, Arrays.asList(split)).count(); + if (count>0){ + return R.fail("请先删除该类型下的点位"); + } locationTypeService.removeBatchByIds(Arrays.asList(split)); return R.ok(); } -- Gitblit v1.7.1