From 82e6b323d47afb23e55f5de543a0a299dbea345b Mon Sep 17 00:00:00 2001
From: lyf66 <admin@cloudowr.com>
Date: Wed, 9 Apr 2025 15:36:52 +0800
Subject: [PATCH] .

---
 .../SzTreatmentBasisController.java           | 30 +++++++++++++++++++
 .../project/xyt/model/SzTreatmentBasis.java   |  3 ++
 2 files changed, 33 insertions(+)

diff --git a/src/main/java/com/gunshi/project/xyt/controller/SzTreatmentBasisController.java b/src/main/java/com/gunshi/project/xyt/controller/SzTreatmentBasisController.java
index 4c7eebf..31c3c2b 100644
--- a/src/main/java/com/gunshi/project/xyt/controller/SzTreatmentBasisController.java
+++ b/src/main/java/com/gunshi/project/xyt/controller/SzTreatmentBasisController.java
@@ -50,6 +50,12 @@ public class SzTreatmentBasisController{
         dto.setCreateTime(new Date());
         dto.setId(IdWorker.getId());
 
+        if (dto.getStatus() == 0) {
+            dto.setDisplay(0);
+        } else {
+            dto.setDisplay(1);
+        }
+
         boolean result = service.save(dto);
 
         return R.ok(result ? dto : null);
@@ -71,6 +77,11 @@ public class SzTreatmentBasisController{
         dto.setCreateBy(null);
         dto.setCreateName(null);
         dto.setUpdateTime(new Date());
+        if (dto.getStatus() == 0) {
+            dto.setDisplay(0);
+        } else {
+            dto.setDisplay(1);
+        }
         boolean result = service.updateById(dto);
 
         return R.ok(result ? dto : null);
@@ -102,6 +113,25 @@ public class SzTreatmentBasisController{
         return R.ok(parentList);
     }
 
+    @Operation(summary = "获取树-不显示禁用的")
+    @GetMapping("/get/treeFiltered")
+    public R<List<SzTreatmentBasis>> getTreeFiltered() {
+        List<SzTreatmentBasis> list = service.list();
+        if (CollectionUtils.isEmpty(list)){
+            return R.ok(list);
+        }
+        Map<Long, List<SzTreatmentBasis>> listMap = list.stream().collect(Collectors.groupingBy(SzTreatmentBasis::getPId));
+
+        list.forEach(o -> o.setChildren(listMap.get(o.getId())));
+        List<SzTreatmentBasis> parentList = list.stream()
+                .filter(o -> 0L == o.getPId())
+                .collect(Collectors.toList());
+
+
+
+        return R.ok(parentList);
+    }
+
     @Operation(summary = "删除")
     @GetMapping("/del/{id}")
     public R<Boolean> del(@Schema(name = "id") @PathVariable("id") Serializable id) {
diff --git a/src/main/java/com/gunshi/project/xyt/model/SzTreatmentBasis.java b/src/main/java/com/gunshi/project/xyt/model/SzTreatmentBasis.java
index a3774ca..6ef1385 100644
--- a/src/main/java/com/gunshi/project/xyt/model/SzTreatmentBasis.java
+++ b/src/main/java/com/gunshi/project/xyt/model/SzTreatmentBasis.java
@@ -117,6 +117,9 @@ public class SzTreatmentBasis extends CommUpdate implements Serializable {
     @Size(max = 2000,message = "处罚措施最大长度要小于 2000")
     private String penalties;
 
+    @TableField(value="display")
+    @Schema(description="给需要不显示禁用的菜单项使用，0=不显示")
+    private Integer display;
 
 //    /**
 //     * 更新人Id