From f93a3eea4b77ee02e3657dec85eef7262b1b0c93 Mon Sep 17 00:00:00 2001
From: zhangwenhe <1126468209@qq.com>
Date: Wed, 13 Nov 2019 14:51:12 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E4=BF=AE=E6=94=B9=E9=83=A8?=
 =?UTF-8?q?=E9=97=A8=E6=88=96=E5=85=AC=E5=8F=B8=E5=90=8D=E7=A7=B0=E5=90=8E?=
 =?UTF-8?q?=EF=BC=8C=E7=94=A8=E6=88=B7=E5=88=97=E8=A1=A8=E6=89=80=E5=B1=9E?=
 =?UTF-8?q?=E6=9C=BA=E6=9E=84,=E5=85=AC=E5=8F=B8=E6=B2=A1=E6=9C=89?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=9A=84=E9=97=AE=E9=A2=98=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/jeesite/modules/sys/entity/EmpUser.java  | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

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 00c4a954..587f93a4 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
@@ -27,7 +27,12 @@ import com.jeesite.common.utils.excel.fieldtype.OfficeType;
 		@JoinTable(type=Type.JOIN, entity=Employee.class, alias="e",
 			on="e.emp_code=a.ref_code AND a.user_type=#{USER_TYPE_EMPLOYEE}",
 			attrName="employee", columns={
-					@Column(includeEntity=Employee.class)
+				////解决修改部门或公司名称后，用户列表所属机构没有修改的问题。
+				@Column(includeEntity=BaseEntity.class),
+				@Column(includeEntity=DataEntity.class),
+				@Column(name="emp_code", 	attrName="empCode", 			label="员工编码", isPK=true),
+				@Column(name="emp_name", 	attrName="empName", 			label="员工姓名", queryType=QueryType.LIKE),
+				@Column(name="emp_name_en", attrName="empNameEn", 			label="英文名", queryType=QueryType.LIKE),
 			}),
 		@JoinTable(type=Type.LEFT_JOIN, entity=Office.class, alias="o", 
 			on="o.office_code=e.office_code", attrName="employee.office",
-- 
Gitee