From 675af262e4e511c9a240d9c1fa3332d1dc8d0c42 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期二, 13 一月 2026 13:15:37 +0800
Subject: [PATCH] 1.工时管理：辅助工时编辑后录入人姓名变成编辑人问题修复 2.外购下单：标签打印功能调整 3.人员：培训计划导入导出添加【培训大类】字段 4.业务管理：报检新增【物料属性】字段选择，其余页面添加【物料属性】查询条件以及数据回显
---
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/TreeSelect.java | 30 +++++++++++++++++++++++++++++-
1 files changed, 29 insertions(+), 1 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 ae25df2..33818ce 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
@@ -11,7 +11,7 @@
/**
* Treeselect鏍戠粨鏋勫疄浣撶被
- *
+ *
* @author ruoyi
*/
public class TreeSelect implements Serializable
@@ -23,6 +23,12 @@
/** 鑺傜偣鍚嶇О */
private String label;
+
+ /** 鏄惁鍙互閫夋嫨浠呯湅鎴�, 0:鍚�, 1:鏄� */
+ private Integer isRersonalButton;
+
+ /** 鏄惁纭鍙湅鎴�, 0:鍚�, 1:鏄� */
+ private Integer isRersonal;
/** 鑺傜偣绂佺敤 */
private boolean disabled = false;
@@ -48,6 +54,8 @@
{
this.id = menu.getMenuId();
this.label = menu.getMenuName();
+ this.isRersonalButton = menu.getIsRersonalButton();
+ this.isRersonal = menu.getIsRersonal();
this.children = menu.getChildren().stream().map(TreeSelect::new).collect(Collectors.toList());
}
@@ -90,4 +98,24 @@
{
this.children = children;
}
+
+ public Integer getIsRersonalButton()
+ {
+ return isRersonalButton;
+ }
+
+ public void setIsRersonalButton(Integer isRersonalButton)
+ {
+ this.isRersonalButton = isRersonalButton;
+ }
+
+ public Integer getIsRersonal()
+ {
+ return isRersonal;
+ }
+
+ public void setIsRersonal(Integer isRersonalButton)
+ {
+ this.isRersonal = isRersonal;
+ }
}
--
Gitblit v1.9.3