修改品牌分类问题

ruoyi-demo/src/main/java/com/ruoyi/demo/entity/Brand.java

@@ -85,4 +85,7 @@ public class Brand implements Serializable {
     @TableLogic
     @TableField("show_delete")
     private int showDelete;
+
+    @TableField("manage_type_code")
+    private String manageTypeCode;
 }

ruoyi-demo/src/main/java/com/ruoyi/demo/entity/vo/ListQueryBody.java

@@ -32,4 +32,9 @@ public class ListQueryBody implements Serializable {
     private Integer pageNum;
 
     private Integer pageSize;
+
+    //企业过滤条件
+    private String enterpriseName;
+    private String businessStatus;
+    private String enterpriseType;
 }

ruoyi-demo/src/main/java/com/ruoyi/demo/mapper/BrandMapper.java

@@ -13,7 +13,7 @@ import java.util.List;
 
 @Mapper
 public interface BrandMapper extends BaseMapper<Brand> {
-    List<Brand> searchByIndustryCodeList(String brandId, String industryCode);
+    List<Brand> searchByIndustryCodeList(String brandId, String manageTypeCode);
 
     List<BrandSearch> searchSearchByMulti(@Param("text") String text, @Param("industryCode") List<String> industryCode, @Param("countUp") Integer countUp, @Param("countDown") Integer countDown, @Param("coverUp") Integer coverUp, @Param("coverDown") Integer coverDown);
 

ruoyi-demo/src/main/java/com/ruoyi/demo/service/impl/BrandServiceImpl.java

@@ -161,9 +161,10 @@ public class BrandServiceImpl implements BrandService {
             return new ArrayList<>();
 
         // 再根据industryCode得到其他品牌的信息
-        if (brand.getIndustryCode() == null)
+        if (brand.getManageTypeCode() == null || brand.getManageTypeCode().equals(""))
             return new ArrayList<>();
-        List<Brand> brands = brandMapper.searchByIndustryCodeList(brandId, brand.getIndustryCode());
+
+        List<Brand> brands = brandMapper.searchByIndustryCodeList(brandId, brand.getManageTypeCode());
         if (brands.isEmpty())
             return new ArrayList<>();
 

ruoyi-demo/src/main/resources/mapper/demo/BrandMapper.xml

@@ -40,7 +40,7 @@
         <result property="count" column="count"/>
     </resultMap>
     <select id="searchByIndustryCodeList" resultMap="BrandResult">
-        select * from ddt_brand where industry_code = #{industryCode} and brand_id <![CDATA[<>]]> #{brandId} and show_delete=0
+        select * from ddt_brand where manage_type_code = #{manageTypeCode} and brand_id <![CDATA[<>]]> #{brandId} and show_delete=0
     </select>
     <select id="searchSearchByMulti" resultMap="BrandSearchResult">
         SELECT