From cf7740957f2b859e541116f2f4603beff8a0c832 Mon Sep 17 00:00:00 2001 From: xuhy <3313886187@qq.com> Date: 星期五, 20 十二月 2024 17:19:38 +0800 Subject: [PATCH] 修改 --- ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TGoodsTypeController.java | 16 ++++++++++++---- 1 files changed, 12 insertions(+), 4 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TGoodsTypeController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TGoodsTypeController.java index 6247028..dc9f2ea 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TGoodsTypeController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TGoodsTypeController.java @@ -5,8 +5,10 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.framework.web.service.TokenService; +import com.ruoyi.system.domain.TFoundationConfig; import com.ruoyi.system.domain.TGoodsType; import com.ruoyi.system.domain.TShop; +import com.ruoyi.system.service.TFoundationConfigService; import com.ruoyi.system.service.TGoodsTypeService; import com.ruoyi.system.service.TShopService; import io.swagger.annotations.Api; @@ -33,12 +35,14 @@ private final TGoodsTypeService goodsTypeService; private final TokenService tokenService; private final TShopService shopService; + private final TFoundationConfigService foundationConfigService; @Autowired - public TGoodsTypeController(TGoodsTypeService goodsTypeService, TokenService tokenService, TShopService shopService) { + public TGoodsTypeController(TGoodsTypeService goodsTypeService, TokenService tokenService, TShopService shopService, TFoundationConfigService foundationConfigService) { this.goodsTypeService = goodsTypeService; this.tokenService = tokenService; this.shopService = shopService; + this.foundationConfigService = foundationConfigService; } /** @@ -72,9 +76,7 @@ // return AjaxResult.error("无"+str+"类型店铺"); // } LambdaQueryWrapper<TGoodsType> wrapper = new LambdaQueryWrapper<>(); - if(Objects.isNull(mealType)){ - wrapper.eq(TGoodsType::getMealType, 2); - }else { + if(Objects.nonNull(mealType)){ wrapper.eq(TGoodsType::getMealType, mealType); } return AjaxResult.success(goodsTypeService.list(wrapper)); @@ -117,6 +119,12 @@ @ApiOperation( value = "删除商品分类") @DeleteMapping(value = "/deleteById") public AjaxResult<Boolean> deleteById(@RequestParam("id") Long id) { + // 查询分类是否在生成配置里面存在 + long count = foundationConfigService.count(Wrappers.lambdaQuery(TFoundationConfig.class) + .eq(TFoundationConfig::getTypeId, id)); + if(count>0){ + return AjaxResult.warn("该分类在基础设置中正在使用,无法删除"); + } return AjaxResult.success(goodsTypeService.removeById(id)); } -- Gitblit v1.7.1