Przeglądaj źródła

fix:修复缺少租户id字段,更新删除接口以支持批量删除,更新id的数据类型

qingwudarao 6 miesięcy temu
rodzic
commit
47364951a5

+ 4 - 4
ruoyi-modules/ruoyi-commodityManagement/src/main/java/org/dromara/commodityManagement/controller/BrandController.java

@@ -52,11 +52,11 @@ public class BrandController extends BaseController {
 
     /**
      * 删除品牌
-     * @param brandId 品牌ID
+     * @param brandIds 品牌ID
      * @return 删除结果
      */
-    @DeleteMapping()
-    public R<Void> deleteBrandByIds(@RequestParam int brandId) {
-        return toAjax(brandService.deleteBrandById(brandId));
+    @DeleteMapping("/{brandIds}")
+    public R<Void> deleteBrandByIds(@PathVariable Long[] brandIds) {
+        return toAjax(brandService.deleteBrandById(brandIds));
     }
 }

+ 11 - 1
ruoyi-modules/ruoyi-commodityManagement/src/main/java/org/dromara/commodityManagement/domain/Brand.java

@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
+import java.math.BigInteger;
+
 @Data
 @TableName("fa_kuyou_item_name")
 public class Brand{
@@ -11,7 +13,13 @@ public class Brand{
      * 品牌ID
      */
     @TableId("id")
-    private int id;
+    private BigInteger id;
+
+    /**
+     *租户ID
+     */
+    private BigInteger tenant_id;
+
     /**
      * 品牌名称
      */
@@ -22,4 +30,6 @@ public class Brand{
      * 1.款号 2.品牌组
      */
     private String type;
+
+
 }

+ 8 - 1
ruoyi-modules/ruoyi-commodityManagement/src/main/java/org/dromara/commodityManagement/domain/bo/BrandBo.java

@@ -6,6 +6,8 @@ import jakarta.validation.constraints.NotBlank;
 import lombok.Data;
 import org.dromara.commodityManagement.domain.Brand;
 
+import java.math.BigInteger;
+
 /**
  * 品牌业务对象
  */
@@ -17,7 +19,12 @@ public class BrandBo {
      * 品牌ID
      */
     @TableId("id")
-    private int id;
+    private BigInteger id;
+
+    /**
+     *租户ID
+     */
+    private BigInteger tenant_id;
 
     /**
      * 品牌名称

+ 9 - 0
ruoyi-modules/ruoyi-commodityManagement/src/main/java/org/dromara/commodityManagement/domain/vo/BrandVo.java

@@ -5,17 +5,26 @@ import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
 import org.dromara.commodityManagement.domain.Brand;
 
+import java.math.BigInteger;
+
 /**
  * 品牌值对象
  */
 @Data
 @AutoMapper(target = Brand.class)
 public class BrandVo {
+
     /**
      * 品牌ID
      */
     @TableId("id")
     private int id;
+
+    /**
+     *租户ID
+     */
+    private BigInteger tenant_id;
+
     /**
      * 品牌名称
      */

+ 1 - 1
ruoyi-modules/ruoyi-commodityManagement/src/main/java/org/dromara/commodityManagement/service/BrandService.java

@@ -12,5 +12,5 @@ public interface BrandService {
 
     int updateBrand(BrandBo brandBo);
 
-    int deleteBrandById(int brandId);
+    int deleteBrandById(Long[] brandId);
 }

+ 7 - 3
ruoyi-modules/ruoyi-commodityManagement/src/main/java/org/dromara/commodityManagement/service/impl/BrandServiceImpl.java

@@ -15,6 +15,9 @@ import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.springframework.stereotype.Service;
 
+import java.math.BigInteger;
+import java.util.Arrays;
+
 /**
  * 品牌服务实现
  */
@@ -39,6 +42,7 @@ public class BrandServiceImpl implements BrandService {
     public TableDataInfo<BrandVo> selectPageBrandList(BrandBo brandBo,PageQuery pageQuery) {
         QueryWrapper<Brand> qw = new QueryWrapper<>();
         qw.eq(StringUtils.isNotBlank(brandBo.getName()), "name", brandBo.getName());
+        qw.eq(null != brandBo.getTenant_id(),"tenant_id", brandBo.getTenant_id());
         qw.eq("type", BRAND_TYPE);
         Page<BrandVo> page = brandMapper.selectVoPage(pageQuery.build(), qw);
         return TableDataInfo.build(page);
@@ -72,12 +76,12 @@ public class BrandServiceImpl implements BrandService {
 
     /**
      * 删除品牌
-     * @param brandId BrandId
+     * @param brandIds BrandIds
      * @return 结果
      */
     @Override
-    public int deleteBrandById(int brandId) {
-        return brandMapper.deleteById(brandId);
+    public int deleteBrandById(Long[] brandIds) {
+        return brandMapper.deleteByIds(Arrays.asList(brandIds));
     }
 
     /**