From f604cf4988107bdce6ce9bc596b85a797531b717 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期五, 26 十一月 2021 15:18:11 +0800
Subject: [PATCH] fix 修复提交错误
---
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/TreeSelect.java | 45 +++++++++++++++++++++++++++++++--------------
1 files changed, 31 insertions(+), 14 deletions(-)
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/TreeSelect.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/TreeSelect.java
index 2049486..963ac5c 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/TreeSelect.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/TreeSelect.java
@@ -3,7 +3,10 @@
import com.fasterxml.jackson.annotation.JsonInclude;
import com.ruoyi.common.core.domain.entity.SysDept;
import com.ruoyi.common.core.domain.entity.SysMenu;
-import lombok.*;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.NoArgsConstructor;
import lombok.experimental.Accessors;
import java.io.Serializable;
@@ -12,39 +15,53 @@
/**
* Treeselect鏍戠粨鏋勫疄浣撶被
- *
- * @author ruoyi
+ *
+ * @author Lion Li
*/
@Data
@NoArgsConstructor
@Accessors(chain = true)
-public class TreeSelect implements Serializable
-{
+@ApiModel("鏍戠粨鏋勫疄浣撶被")
+public class TreeSelect implements Serializable {
+
private static final long serialVersionUID = 1L;
- /** 鑺傜偣ID */
+ /**
+ * 鑺傜偣ID
+ */
+ @ApiModelProperty(value = "鑺傜偣ID")
private Long id;
- /** 鑺傜偣鍚嶇О */
+ /**
+ * 鑺傜偣鍚嶇О
+ */
+ @ApiModelProperty(value = "鑺傜偣鍚嶇О")
private String label;
- /** 瀛愯妭鐐� */
+ /**
+ * 瀛愯妭鐐�
+ */
+ @ApiModelProperty(value = "瀛愯妭鐐�")
@JsonInclude(JsonInclude.Include.NON_EMPTY)
private List<TreeSelect> children;
- public TreeSelect(SysDept dept)
- {
+ public TreeSelect(SysDept dept) {
this.id = dept.getDeptId();
this.label = dept.getDeptName();
- this.children = dept.getChildren().stream().map(TreeSelect::new).collect(Collectors.toList());
+ this.children = dept.getChildren()
+ .stream()
+ .map(d -> new TreeSelect((SysDept) d))
+ .collect(Collectors.toList());
}
- public TreeSelect(SysMenu menu)
- {
+ public TreeSelect(SysMenu menu) {
this.id = menu.getMenuId();
this.label = menu.getMenuName();
- this.children = menu.getChildren().stream().map(TreeSelect::new).collect(Collectors.toList());
+ this.children = menu.getChildren()
+ .stream()
+ .map(d -> new TreeSelect((SysMenu) d))
+ .collect(Collectors.toList());
}
}
--
Gitblit v1.9.3