修改

xuhy

2024-10-31 17afbc2125b4df86f9d7846c02ddc7bc4a8ccc99

修改

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TGoodsTypeController.java

@@ -47,13 +47,13 @@
    @ApiOperation( value = "查询商品分类列表")
    @PostMapping(value = "/list")
    public AjaxResult<List<TGoodsType>> list() {
        Long shopId = tokenService.getLoginUser().getObjectId();
        Integer roleType = tokenService.getLoginUser().getRoleType();
        LambdaQueryWrapper<TGoodsType> wrapper = new LambdaQueryWrapper<>();
        if(roleType != 1){
            wrapper.eq(TGoodsType::getShopId, shopId);
        }
        return AjaxResult.success(goodsTypeService.list(wrapper));
//        Long shopId = tokenService.getLoginUser().getObjectId();
//        Integer roleType = tokenService.getLoginUser().getRoleType();
//        LambdaQueryWrapper<TGoodsType> wrapper = new LambdaQueryWrapper<>();
//        if(roleType != 1){
//            wrapper.eq(TGoodsType::getShopId, shopId);
//        }
        return AjaxResult.success(goodsTypeService.list());
    }

    /**
@@ -63,16 +63,16 @@
    @GetMapping(value = "/getList")
    public AjaxResult<List<TGoodsType>> getList(@RequestParam("mealType") Integer mealType) {
        // 获取餐饮分类店铺id
        TShop one = shopService.getOne(Wrappers.lambdaQuery(TShop.class)
                .eq(TShop::getMealType, mealType)
                .last("LIMIT 1"));
        if(Objects.isNull(one)){
            String str = mealType == 1 ? "中餐" : "火锅";
            return AjaxResult.error("无"+str+"类型店铺");
        }
        LambdaQueryWrapper<TGoodsType> wrapper = new LambdaQueryWrapper<>();
        wrapper.eq(TGoodsType::getShopId, one.getId());
        return AjaxResult.success(goodsTypeService.list(wrapper));
//        TShop one = shopService.getOne(Wrappers.lambdaQuery(TShop.class)
//                .eq(TShop::getMealType, mealType)
//                .last("LIMIT 1"));
//        if(Objects.isNull(one)){
//            String str = mealType == 1 ? "中餐" : "火锅";
//            return AjaxResult.error("无"+str+"类型店铺");
//        }
//        LambdaQueryWrapper<TGoodsType> wrapper = new LambdaQueryWrapper<>();
//        wrapper.eq(TGoodsType::getShopId, one.getId());
        return AjaxResult.success(goodsTypeService.list());
    }

    /**