From a7b458af90f4e92e83e355e8fcbccf5778a42ac9 Mon Sep 17 00:00:00 2001
From: thinkgem <thinkgem@163.com>
Date: Tue, 28 Jan 2025 11:43:21 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=B0=E5=AF=8C=20EmployeeOffice=20=E8=BF=94?=
 =?UTF-8?q?=E5=9B=9E=E7=BB=93=E6=9E=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/sys/entity/EmployeeOffice.java    | 36 +++++++++++++++++--
 1 file changed, 33 insertions(+), 3 deletions(-)

diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/entity/EmployeeOffice.java b/modules/core/src/main/java/com/jeesite/modules/sys/entity/EmployeeOffice.java
index 937b151d..5d12790f 100644
--- a/modules/core/src/main/java/com/jeesite/modules/sys/entity/EmployeeOffice.java
+++ b/modules/core/src/main/java/com/jeesite/modules/sys/entity/EmployeeOffice.java
@@ -4,14 +4,13 @@
  */
 package com.jeesite.modules.sys.entity;
 
-import javax.validation.constraints.Size;
-
 import com.jeesite.common.entity.DataEntity;
 import com.jeesite.common.mybatis.annotation.Column;
 import com.jeesite.common.mybatis.annotation.JoinTable;
-import com.jeesite.common.mybatis.annotation.Table;
 import com.jeesite.common.mybatis.annotation.JoinTable.Type;
+import com.jeesite.common.mybatis.annotation.Table;
 import com.jeesite.common.mybatis.mapper.query.QueryType;
+import javax.validation.constraints.Size;
 
 /**
  * 附属机构Entity
@@ -29,7 +28,10 @@ import com.jeesite.common.mybatis.mapper.query.QueryType;
 			columns={
 				@Column(name="office_code", label="机构编码", isPK=true),
 				@Column(name="parent_codes",label="所有父级编码", queryType=QueryType.LIKE),
+				@Column(name="view_code", label="机构代码", isQuery=false),
 				@Column(name="office_name", label="机构名称", isQuery=false),
+				@Column(name="full_name", label="机构全称", isQuery=false),
+				@Column(name="tree_names", label="全节点名", isQuery=false),
 			}),
 		@JoinTable(type=Type.LEFT_JOIN, entity=Post.class, alias="p", 
 			on="p.post_code=a.post_code", attrName="this",
@@ -47,7 +49,11 @@ public class EmployeeOffice extends DataEntity<EmployeeOffice> {
 	private String postCode;	// 岗位编码
 
 	private String parentCodes;	// 机构所有上级编码（数据权限用）
+	private String viewCode;	// 机构代码（联合查询项）
 	private String officeName;	// 机构名称（联合查询项）
+	private String fullName;	// 机构全称（联合查询项）
+	private String treeNames;	// 机构全称（联合查询项）
+
 	private String postName;	// 岗位名称（联合查询项）
 	
 	public EmployeeOffice() {
@@ -93,6 +99,14 @@ public class EmployeeOffice extends DataEntity<EmployeeOffice> {
 		this.parentCodes = parentCodes;
 	}
 
+	public String getViewCode() {
+		return viewCode;
+	}
+
+	public void setViewCode(String viewCode) {
+		this.viewCode = viewCode;
+	}
+
 	public String getOfficeName() {
 		return officeName;
 	}
@@ -101,6 +115,22 @@ public class EmployeeOffice extends DataEntity<EmployeeOffice> {
 		this.officeName = officeName;
 	}
 
+	public String getFullName() {
+		return fullName;
+	}
+
+	public void setFullName(String fullName) {
+		this.fullName = fullName;
+	}
+
+	public String getTreeNames() {
+		return treeNames;
+	}
+
+	public void setTreeNames(String treeNames) {
+		this.treeNames = treeNames;
+	}
+
 	public String getPostName() {
 		return postName;
 	}