From c1ca1800b41f701ad05fc6cdf1ca9689ff8a2d5f Mon Sep 17 00:00:00 2001
From: han0 <wslshanlin@sina.com>
Date: Tue, 19 Dec 2023 09:31:46 +0800
Subject: [PATCH] =?UTF-8?q?fix(material):=20=E6=96=B0=E5=A2=9E=E6=98=AF?=
 =?UTF-8?q?=E5=90=A6=E6=A0=91=E7=9A=84=E5=88=A4=E6=96=AD=E6=A0=87=E8=AF=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/controller/MaterialController.java   | 20 +++++++++++--------
 .../mjkf/xinke/main/model/db/Material.java    |  5 +++++
 .../main/model/vo/MaterialCreateRequest.java  |  3 +++
 3 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/src/main/java/mjkf/xinke/main/controller/MaterialController.java b/src/main/java/mjkf/xinke/main/controller/MaterialController.java
index 63ab4e3..7acff52 100644
--- a/src/main/java/mjkf/xinke/main/controller/MaterialController.java
+++ b/src/main/java/mjkf/xinke/main/controller/MaterialController.java
@@ -40,7 +40,8 @@ public class MaterialController {
     @ApiOperation("获取材料树")
     @GetMapping("/tree")
     public HttpResponse getTree () {
-        QueryWrapper<Material> query = new QueryWrapper<>();
+        LambdaQueryWrapper<Material> query = new LambdaQueryWrapper<>();
+        query.eq(Material::getIsTree, 1);
         List<Map<String, Object>> maps = materialService.listMaps(query);
         maps = maps.stream().map(map -> convertKeysToLowercase(map)).collect(Collectors.toList());
         // todo 列转树改为泛型对象入参
@@ -65,15 +66,18 @@ public class MaterialController {
             @ApiParam(value = "父节点id") @RequestParam("parent_id") String parentId
     ) {
         LambdaQueryWrapper<Material> query = new LambdaQueryWrapper<>();
-        if (parentId != null){
+        query.eq(Material::getIsTree, 0);
+        if (parentId != null) {
             query.eq(Material::getParentId, parentId);
         }
-        query.and(q -> q
-                .like(Material::getCategory1, keyWord).or()
-                .like(Material::getCategory2, keyWord).or()
-                .like(Material::getCategory3, keyWord).or()
-                .like(Material::getCategory4, keyWord)
-        );
+        if (keyWord != null) {
+            query.and(q -> q
+                    .like(Material::getCategory1, keyWord).or()
+                    .like(Material::getCategory2, keyWord).or()
+                    .like(Material::getCategory3, keyWord).or()
+                    .like(Material::getCategory4, keyWord)
+            );
+        }
         var result = materialService.list(query);
 
         return FuHttpResponse.Builder().dataResponse(result).build();
diff --git a/src/main/java/mjkf/xinke/main/model/db/Material.java b/src/main/java/mjkf/xinke/main/model/db/Material.java
index 40039e7..bbe2deb 100644
--- a/src/main/java/mjkf/xinke/main/model/db/Material.java
+++ b/src/main/java/mjkf/xinke/main/model/db/Material.java
@@ -119,6 +119,10 @@ public class Material extends Model<Material> {
     @TableField("`TYPE`")
     private Integer type;
 
+    @ApiModelProperty("是否树")
+    @TableField("`IS_TREE`")
+    private Integer isTree;
+
     @Override
     public Serializable pkVal() {
         return this.id;
@@ -144,6 +148,7 @@ public class Material extends Model<Material> {
         this.unit = params.getUnit();
         this.spec = params.getSpec();
         this.tax = params.getTax();
+        this.isTree = params.getIsTree();
         this.updateTime = LocalDateTime.now();
         this.createTime = LocalDateTime.now();
         this.createUserName = user.getName();
diff --git a/src/main/java/mjkf/xinke/main/model/vo/MaterialCreateRequest.java b/src/main/java/mjkf/xinke/main/model/vo/MaterialCreateRequest.java
index cbdad3e..09d69b6 100644
--- a/src/main/java/mjkf/xinke/main/model/vo/MaterialCreateRequest.java
+++ b/src/main/java/mjkf/xinke/main/model/vo/MaterialCreateRequest.java
@@ -40,6 +40,9 @@ public class MaterialCreateRequest {
     @ApiModelProperty("税率")
     private Integer tax;
 
+    @ApiModelProperty("是否树")
+    private Integer isTree;
+
     public void check() throws Exception{
         String flag = this.parentId.replace(".00", "");
         if (!this.id.contains(flag)) {