manager/my-worker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://gitee.com/thinkgem/jeesite4

Browse Source
This commit is contained in:
thinkgem
2020-01-02 16:48:40 +08:00
parent e470ce7865 a29b2939f9
commit 0d5176d53e
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
modules/core/src/main/java/com/jeesite/modules/sys/entity/EmpUser.java
View File

@@ -5,6 +5,8 @@ package com.jeesite.modules.sys.entity;
import javax.validation.Valid; import javax.validation.Valid;
import com.jeesite.common.entity.BaseEntity;
import com.jeesite.common.entity.DataEntity;
import com.jeesite.common.mybatis.annotation.Column; import com.jeesite.common.mybatis.annotation.Column;
import com.jeesite.common.mybatis.annotation.JoinTable; import com.jeesite.common.mybatis.annotation.JoinTable;
import com.jeesite.common.mybatis.annotation.JoinTable.Type; import com.jeesite.common.mybatis.annotation.JoinTable.Type;
@@ -27,7 +29,11 @@ import com.jeesite.common.utils.excel.fieldtype.OfficeType;
@JoinTable(type=Type.JOIN, entity=Employee.class, alias="e", @JoinTable(type=Type.JOIN, entity=Employee.class, alias="e",
on="e.emp_code=a.ref_code AND a.user_type=#{USER_TYPE_EMPLOYEE}", on="e.emp_code=a.ref_code AND a.user_type=#{USER_TYPE_EMPLOYEE}",
attrName="employee", columns={ 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", @JoinTable(type=Type.LEFT_JOIN, entity=Office.class, alias="o",
on="o.office_code=e.office_code", attrName="employee.office", on="o.office_code=e.office_code", attrName="employee.office",

2
parent/pom.xml
View File

@@ -48,7 +48,7 @@
<mybatis-spring.version>1.3.2</mybatis-spring.version> <mybatis-spring.version>1.3.2</mybatis-spring.version>
<jsqlparser.version>1.1</jsqlparser.version> <jsqlparser.version>1.1</jsqlparser.version>
<druid.version>1.1.18</druid.version> <druid.version>1.1.18</druid.version>
<shiro.version>1.4.0</shiro.version> <shiro.version>1.4.2</shiro.version>
<j2cache.version>2.7.0-release</j2cache.version> <j2cache.version>2.7.0-release</j2cache.version>
<beetl.version>3.0-SNAPSHOT</beetl.version> <beetl.version>3.0-SNAPSHOT</beetl.version>
<swagger.version>1.5.20</swagger.version> <swagger.version>1.5.20</swagger.version>