产品分类树问题处理

hx-item/src/main/java/com/fjhx/item/entity/product/po/ProductClassify.java

@@ -5,8 +5,6 @@ import com.ruoyi.common.core.domain.BasePo;
 import lombok.Getter;
 import lombok.Setter;
 
-import javax.validation.constraints.NotNull;
-
 /**
  * <p>
  * 产品分类
@@ -23,7 +21,6 @@ public class ProductClassify extends BasePo {
     /**
      * 定义 1产品 2物料
      */
-    @NotNull(message = "定义不能为空")
     private Integer definition;
 
     /**

hx-item/src/main/java/com/fjhx/item/service/product/impl/ProductClassifyServiceImpl.java

@@ -37,6 +37,7 @@ public class ProductClassifyServiceImpl extends ServiceImpl<ProductClassifyMappe
     public List<JSONObject> tree(ProductClassifyDto productClassify) {
         // 分类名称
         String name = productClassify.getName();
+        Integer definition = productClassify.getDefinition();
 
         //是否不显示原材料数据
         Integer isNeRawMaterial = productClassify.getIsNeRawMaterial();
@@ -50,7 +51,7 @@ public class ProductClassifyServiceImpl extends ServiceImpl<ProductClassifyMappe
 
         List<ProductClassify> list = lambdaQuery()
                 .select(ProductClassify::getId, ProductClassify::getName, ProductClassify::getParentId, ProductClassify::getSort, ProductClassify::getParentIdSet)
-                .eq(ProductClassify::getDefinition, productClassify.getDefinition())
+                .eq(ObjectUtil.isNotEmpty(definition), ProductClassify::getDefinition, definition)
                 .like(ObjectUtil.isNotEmpty(name), ProductClassify::getName, name)
                 .notIn(ObjectUtil.isNotEmpty(pcIds), ProductClassify::getId, pcIds)
                 .and(ObjectUtil.isNotEmpty(productClassify.getAncestors()), q -> q