From c439bf5bc781ae0aedf4dc0d4abf6d0d48417a8f Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期四, 13 二月 2025 10:36:31 +0800
Subject: [PATCH] Merge branch 'xizang-changyun' of https://gitee.com/xiaochen991015/xizang
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TItemTypeController.java | 17 ++++++++++++++++-
1 files changed, 16 insertions(+), 1 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TItemTypeController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TItemTypeController.java
index 01a651f..e35db1f 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TItemTypeController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TItemTypeController.java
@@ -6,8 +6,10 @@
import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.system.model.TItem;
import com.ruoyi.system.model.TItemType;
import com.ruoyi.system.query.TItemTypeQuery;
+import com.ruoyi.system.service.TItemService;
import com.ruoyi.system.service.TItemTypeService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -32,9 +34,11 @@
public class TItemTypeController {
private final TItemTypeService itemTypeService;
+ private final TItemService itemService;
@Autowired
- public TItemTypeController(TItemTypeService itemTypeService) {
+ public TItemTypeController(TItemTypeService itemTypeService, TItemService itemService) {
this.itemTypeService = itemTypeService;
+ this.itemService = itemService;
}
/**
@@ -103,6 +107,10 @@
@ApiOperation(value = "删除维修物品分类")
@DeleteMapping(value = "/deleteById")
public R<Boolean> deleteById(@RequestParam String id) {
+ long count = itemService.count(Wrappers.lambdaQuery(TItem.class).eq(TItem::getTypeId, id));
+ if (count>0) {
+ return R.fail("该分类下有维修物品，无法删除");
+ }
return R.ok(itemTypeService.removeById(id));
}
@@ -114,6 +122,13 @@
@ApiOperation(value = "批量删除维修物品分类")
@DeleteMapping(value = "/deleteByIds")
public R<Boolean> deleteByIds(@RequestBody List<String> ids) {
+ List<TItem> items = itemService.list(Wrappers.lambdaQuery(TItem.class).in(TItem::getTypeId, ids));
+ for (String id : ids) {
+ if (items.stream().anyMatch(t -> t.getTypeId().equals(id))) {
+ TItemType itemType = itemTypeService.getById(id);
+ return R.fail("该分类["+itemType.getTypeName()+"]下有维修物品，无法删除");
+ }
+ }
return R.ok(itemTypeService.removeByIds(ids));
}
--
Gitblit v1.7.1