From 8d9596f650523d8b6981657bd26078cb1ec09885 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期四, 13 三月 2025 16:57:06 +0800
Subject: [PATCH] 修改
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TGoodsTypeController.java | 13 +++++++------
1 files changed, 7 insertions(+), 6 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 735f043..ca5efb0 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
@@ -56,7 +56,11 @@
TShop shop = shopService.getById(shopId);
LambdaQueryWrapper<TGoodsType> wrapper = new LambdaQueryWrapper<>();
if(roleType != 1){
- wrapper.eq(TGoodsType::getMealType, shop.getMealType());
+ if(roleType == 2){
+ wrapper.eq(TGoodsType::getMealType, shop.getMealType());
+ }else {
+ wrapper.isNull(TGoodsType::getMealType);
+ }
}
return AjaxResult.success(goodsTypeService.list(wrapper));
}
@@ -75,9 +79,6 @@
// String str = mealType == 1 ? "中餐" : "火锅";
// return AjaxResult.error("无"+str+"类型店铺");
// }
- if(Objects.isNull(mealType)){
- mealType = 2;
- }
LambdaQueryWrapper<TGoodsType> wrapper = new LambdaQueryWrapper<>();
if(Objects.nonNull(mealType)){
wrapper.eq(TGoodsType::getMealType, mealType);
@@ -93,8 +94,8 @@
public AjaxResult<Boolean> add(@RequestBody TGoodsType dto) {
Long shopId = tokenService.getLoginUser().getObjectId();
TShop shop = shopService.getById(shopId);
- dto.setMealType(Objects.nonNull(shop) ? shop.getMealType() : 1);
- dto.setShopId(tokenService.getLoginUser().getObjectId());
+ dto.setMealType(shop.getMealType());
+ dto.setShopId(shopId);
return AjaxResult.success(goodsTypeService.save(dto));
}
--
Gitblit v1.7.1