From da26a61eee160d63ad99b69bcef0b24565c1a8f7 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期四, 10 七月 2025 15:44:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/model/SysDepartTreeModel.java | 34 ++++++++++++++++++++++++----------
1 files changed, 24 insertions(+), 10 deletions(-)
diff --git a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/model/SysDepartTreeModel.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/model/SysDepartTreeModel.java
index e446e76..54b5434 100644
--- a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/model/SysDepartTreeModel.java
+++ b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/model/SysDepartTreeModel.java
@@ -1,5 +1,6 @@
package org.jeecg.modules.system.model;
+import org.jeecg.common.api.vo.ScopedSlots;
import org.jeecg.modules.system.entity.SysDepart;
import java.io.Serializable;
@@ -12,14 +13,14 @@
* <p>
* 閮ㄩ棬琛� 瀛樺偍鏍戠粨鏋勬暟鎹殑瀹炰綋绫�
* <p>
- *
+ *
* @Author Steve
- * @Since 2019-01-22
+ * @Since 2019-01-22
*/
public class SysDepartTreeModel implements Serializable{
-
+
private static final long serialVersionUID = 1L;
-
+
/** 瀵瑰簲SysDepart涓殑id瀛楁,鍓嶇鏁版嵁鏍戜腑鐨刱ey*/
private String key;
@@ -32,7 +33,7 @@
private boolean isLeaf;
// 浠ヤ笅鎵�鏈夊瓧娈靛潎涓嶴ysDepart鐩稿悓
-
+
private String id;
private String parentId;
@@ -46,7 +47,7 @@
private Integer departOrder;
private String description;
-
+
private String orgCategory;
private String orgType;
@@ -85,10 +86,12 @@
/**閮ㄩ棬璐熻矗浜篿ds*/
private String directorUserIds;
//update-end---author:wangshuai ---date:20200308 for锛歔JTC-119]鍦ㄩ儴闂ㄧ鐞嗚彍鍗曚笅璁剧疆閮ㄩ棬璐熻矗浜猴紝鏂板瀛楁閮ㄩ棬璐熻矗浜篿ds
-
+
private List<SysDepartTreeModel> children = new ArrayList<>();
+ private ScopedSlots scopedSlots = new ScopedSlots();
+ private SysDepart entity;
/**
* 灏哠ysDepart瀵硅薄杞崲鎴怱ysDepartTreeModel瀵硅薄
* @param sysDepart
@@ -121,6 +124,7 @@
this.directorUserIds = sysDepart.getDirectorUserIds();
this.useDepartNum = sysDepart.getUseDepartNum();
this.repairDepartNum = sysDepart.getRepairDepartNum();
+ this.entity = sysDepart;
}
public boolean getIsLeaf() {
@@ -199,7 +203,7 @@
public void setDepartName(String departName) {
this.departName = departName;
}
-
+
public String getOrgCategory() {
return orgCategory;
}
@@ -370,6 +374,16 @@
this.repairDepartNum = repairDepartNum;
}
+ public ScopedSlots getScopedSlots(){return scopedSlots;}
+
+ public void setScopedSlots(ScopedSlots scopedSlots){this.scopedSlots = scopedSlots;}
+
+ public SysDepart getEntity(){return entity;}
+
+ public void setEntity(SysDepart entity){this.entity = entity;}
+
+
+
/**
* 閲嶅啓equals鏂规硶
*/
@@ -408,7 +422,7 @@
Objects.equals(repairDepartNum, model.repairDepartNum) &&
Objects.equals(children, model.children);
}
-
+
/**
* 閲嶅啓hashCode鏂规硶
*/
@@ -416,7 +430,7 @@
public int hashCode() {
return Objects.hash(id, parentId, departName, departNameEn, departNameAbbr,
- departOrder, description, orgCategory, orgType, orgCode, mobile, fax, address,
+ departOrder, description, orgCategory, orgType, orgCode, mobile, fax, address,
memo, status, delFlag, qywxIdentifier, createBy, createTime, updateBy, updateTime,
children,directorUserIds,useDepartNum,repairDepartNum);
}
--
Gitblit v1.9.3