From 7ffd310e52ef6135197379f0ac2c4522780e53b9 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期三, 26 八月 2026 17:42:27 +0800
Subject: [PATCH] 修改bug
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TErpGoodsTypeController.java | 16 +++++++++++++++-
1 files changed, 15 insertions(+), 1 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TErpGoodsTypeController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TErpGoodsTypeController.java
index 416a81d..95701ef 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TErpGoodsTypeController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TErpGoodsTypeController.java
@@ -6,6 +6,7 @@
import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.system.constant.GoodsTypeConstants;
import com.ruoyi.system.model.TErpGoods;
import com.ruoyi.system.model.TErpGoodsType;
import com.ruoyi.system.query.TErpGoodsTypeQuery;
@@ -56,6 +57,7 @@
@ApiOperation(value = "获取erp商品类型列表")
@PostMapping(value = "/list")
public R<List<TErpGoodsType>> list() {
+ erpGoodsTypeService.ensureBuiltinTypes();
return R.ok(erpGoodsTypeService.list(Wrappers.lambdaQuery(TErpGoodsType.class).orderByDesc(TErpGoodsType::getCreateTime)));
}
@@ -69,6 +71,7 @@
if (erpGoodsTypeService.isExit(dto)) {
return R.fail("erp商品类型名称已存在");
}
+ dto.setId(null);
return R.ok(erpGoodsTypeService.save(dto));
}
@@ -82,7 +85,12 @@
if (erpGoodsTypeService.isExit(dto)) {
return R.fail("erp商品类型名称已存在");
}
- return R.ok(erpGoodsTypeService.updateById(dto));
+ TErpGoodsType existing = erpGoodsTypeService.getById(dto.getId());
+ if (existing == null) {
+ return R.fail("商品类型不存在");
+ }
+ existing.setTypeName(dto.getTypeName());
+ return R.ok(erpGoodsTypeService.updateById(existing));
}
/**
@@ -101,6 +109,9 @@
@ApiOperation(value = "删除erp商品类型")
@DeleteMapping(value = "/deleteById")
public R<Boolean> deleteById(@RequestParam String id) {
+ if (GoodsTypeConstants.isBuiltin(id)) {
+ return R.fail("内置商品类型不可删除");
+ }
long count = erpGoodsService.count(Wrappers.lambdaQuery(TErpGoods.class).eq(TErpGoods::getTypeId, id));
if (count>0) {
return R.fail("该商品分类下有商品，无法删除");
@@ -115,6 +126,9 @@
@ApiOperation(value = "批量删除erp商品类型")
@DeleteMapping(value = "/deleteByIds")
public R<Boolean> deleteByIds(@RequestBody List<String> ids) {
+ if (ids.stream().anyMatch(GoodsTypeConstants::isBuiltin)) {
+ return R.fail("内置商品类型不可删除");
+ }
List<TErpGoods> items = erpGoodsService.list(Wrappers.lambdaQuery(TErpGoods.class).in(TErpGoods::getTypeId, ids));
for (String id : ids) {
if (items.stream().anyMatch(t -> t.getTypeId().equals(id))) {
--
Gitblit v1.7.1