From d81d10f01a2b6bfd948fb61ea00083ccc526322f Mon Sep 17 00:00:00 2001 From: thinkgem Date: Wed, 22 Jan 2020 18:12:37 +0800 Subject: [PATCH] update --- .../main/java/com/jeesite/modules/sys/entity/EmpUser.java | 6 ------ 1 file changed, 6 deletions(-) diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/entity/EmpUser.java b/modules/core/src/main/java/com/jeesite/modules/sys/entity/EmpUser.java index 65e71c88..bad3c215 100644 --- a/modules/core/src/main/java/com/jeesite/modules/sys/entity/EmpUser.java +++ b/modules/core/src/main/java/com/jeesite/modules/sys/entity/EmpUser.java @@ -43,8 +43,6 @@ import com.jeesite.common.utils.excel.fieldtype.OfficeType; @Column(includeEntity=DataEntity.class), @Column(includeEntity=TreeEntity.class), @Column(name="office_code", label="机构编码", isPK=true), - @Column(name="parent_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="机构全称"), @@ -61,17 +59,13 @@ import com.jeesite.common.utils.excel.fieldtype.OfficeType; @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="区域编码"), }), @JoinTable(type=Type.LEFT_JOIN, entity=Area.class, alias="ar", on="ar.area_code = c.area_code", attrName="employee.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="区域类型"),