fix:优化代码

ruoyi-modules/ruoyi-commodityManagement/src/main/java/org/dromara/commodityManagement/domain/DiBu.java

@@ -2,11 +2,8 @@ package org.dromara.commodityManagement.domain;
 
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import jakarta.validation.constraints.NotBlank;
 import lombok.Data;
 
-import java.math.BigInteger;
-
 /**
  * 底布基类
  */

ruoyi-modules/ruoyi-commodityManagement/src/main/java/org/dromara/commodityManagement/domain/bo/DiBuBo.java

@@ -18,6 +18,11 @@ public class DiBuBo {
     @TableId("id")
     private Long id;
 
+    /**
+     * 租户id
+     */
+    private Long tenant_id;
+
     /**
      * 名称
      */

ruoyi-modules/ruoyi-commodityManagement/src/main/java/org/dromara/commodityManagement/service/impl/CraftServiceImpl.java

@@ -33,6 +33,7 @@ public class CraftServiceImpl implements CraftService {
     public TableDataInfo<CraftVo> selectPageCraftList(CraftBo craftBo, PageQuery pageQuery) {
         QueryWrapper<Craft> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq(StringUtils.isNotBlank(craftBo.getGoodsTypeExtendName()), "goods_type_extend_name", craftBo.getGoodsTypeExtendName());
+        queryWrapper.eq(0 != craftBo.getTenantId(), "goods_type_extend_type", craftBo.getTenantId());
         Page<CraftVo> page = craftMapper.selectVoPage(pageQuery.build(), queryWrapper);
         return TableDataInfo.build(page);
     }

ruoyi-modules/ruoyi-commodityManagement/src/main/java/org/dromara/commodityManagement/service/impl/DiBuServiceImpl.java

@@ -37,6 +37,7 @@ public class DiBuServiceImpl implements DiBuService {
     public TableDataInfo<DiBuVo> selectPageDiBuList(DiBuBo diBuBo, PageQuery pageQuery) {
         QueryWrapper<DiBu> qw = new QueryWrapper<>();
         qw.eq(StringUtils.isNotBlank(diBuBo.getName()), "name", diBuBo.getName());
+        qw.eq(0 != diBuBo.getTenant_id(),"tenant_id", diBuBo.getTenant_id());
         Page<DiBuVo> page = diBuMapper.selectVoPage(pageQuery.build(), qw);
         return TableDataInfo.build(page);
     }

ruoyi-modules/ruoyi-commodityManagement/src/main/java/org/dromara/commodityManagement/service/impl/OemServiceImpl.java

@@ -31,6 +31,7 @@ public class OemServiceImpl implements OemService {
     public TableDataInfo<OemVo> selectPageOemList(OemBo oemBo, PageQuery pageQuery) {
         QueryWrapper<Oem> lqw =new QueryWrapper<>();
         lqw.eq(StringUtils.isNotBlank(oemBo.getName()), "name", oemBo.getName());
+        lqw.eq(0 != oemBo.getTenant_id(),"tenant_id", oemBo.getTenant_id());
         Page<OemVo> page = oemMapper.selectVoPage(pageQuery.build(), lqw);
         return TableDataInfo.build(page);
     }