From e75fa7d6d0de27d2f121b10f0976cbbb2615bb8d Mon Sep 17 00:00:00 2001
From: thinkgem <thinkgem@163.com>
Date: Tue, 21 Jan 2020 17:45:34 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=BC=E5=AE=B9=E6=97=A7=E7=B3=BB=E7=BB=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/entity/Employee.java b/modules/core/src/main/java/com/jeesite/modules/sys/entity/Employee.java
index ecd784ce..4b214949 100644
--- a/modules/core/src/main/java/com/jeesite/modules/sys/entity/Employee.java
+++ b/modules/core/src/main/java/com/jeesite/modules/sys/entity/Employee.java
@@ -12,7 +12,6 @@ import org.hibernate.validator.constraints.Length;
 import com.jeesite.common.collect.ListUtils;
 import com.jeesite.common.entity.BaseEntity;
 import com.jeesite.common.entity.DataEntity;
-import com.jeesite.common.entity.TreeEntity;
 import com.jeesite.common.lang.StringUtils;
 import com.jeesite.common.mybatis.annotation.Column;
 import com.jeesite.common.mybatis.annotation.JoinTable;
@@ -39,42 +38,13 @@ import com.jeesite.common.mybatis.mapper.query.QueryType;
 	}, joinTable={
 		@JoinTable(type=Type.LEFT_JOIN, entity=Office.class, alias="o", 
 			on="o.office_code = a.office_code",
-			columns={
-					@Column(includeEntity=DataEntity.class),
-					@Column(includeEntity=TreeEntity.class),
-					@Column(name="office_code", label="机构编码", isPK=true),
-					@Column(name="parent_codes",label="所有父级编码", queryType=QueryType.LIKE),
-					@Column(name="view_code", 	label="机构代码"),
-					@Column(name="office_name", label="机构名称", isQuery=false),
-					@Column(name="full_name", 	label="机构全称"),
-					@Column(name="office_type", label="机构类型"),
-					@Column(name="leader", 		label="负责人"),
-					@Column(name="phone", 		label="电话"),
-					@Column(name="address", 	label="联系地址"),
-					@Column(name="zip_code", 	label="邮政编码"),
-					@Column(name="email", 		label="邮箱"),
-			}),
+			columns={@Column(includeEntity=Office.class)}),
 		@JoinTable(type=Type.LEFT_JOIN, entity=Company.class, alias="c", 
 			on="c.company_code = a.company_code",
-			columns={
-					@Column(includeEntity=DataEntity.class),
-					@Column(includeEntity=TreeEntity.class),
-					@Column(name="company_code", label="公司编码", isPK=true),
-					@Column(name="parent_codes",label="所有父级编码", queryType=QueryType.LIKE),
-					@Column(name="view_code", 	label="公司代码"),
-					@Column(name="company_name", label="公司名称", isQuery=false),
-					@Column(name="full_name", 	label="公司全称"),
-					@Column(name="area_code", attrName="area.areaCode", label="区域编码"),
-			}),
+			columns={@Column(includeEntity=Company.class)}),
 		@JoinTable(type=Type.LEFT_JOIN, entity=Area.class, alias="ar",
 			on="ar.area_code = c.area_code", attrName="company.area",
-			columns={
-					@Column(includeEntity=DataEntity.class),
-					@Column(includeEntity=TreeEntity.class),
-					@Column(name="area_code", label="区域代码", isPK=true),
-					@Column(name="area_name", label="区域名称", isQuery=false),
-					@Column(name="area_type", label="区域类型"),
-		}),
+			columns={@Column(includeEntity=Area.class)}),
 	}, orderBy="a.update_date DESC"
 )
 public class Employee extends DataEntity<Employee> {