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

update

Browse Source
This commit is contained in:
thinkgem
2020-01-10 16:40:15 +08:00
parent 7ff3a87d9c
commit 5128a5ff3b
3 changed files with 19 additions and 1 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

@@ -7,6 +7,7 @@ import javax.validation.Valid;
import com.jeesite.common.entity.BaseEntity;
import com.jeesite.common.entity.DataEntity;
import com.jeesite.common.entity.TreeEntity;
import com.jeesite.common.mybatis.annotation.Column;
import com.jeesite.common.mybatis.annotation.JoinTable;
import com.jeesite.common.mybatis.annotation.JoinTable.Type;
@@ -39,7 +40,10 @@ import com.jeesite.common.utils.excel.fieldtype.OfficeType;
@JoinTable(type=Type.LEFT_JOIN, entity=Office.class, alias="o",
on="o.office_code=e.office_code", attrName="employee.office",
columns={
@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),
@@ -54,6 +58,8 @@ import com.jeesite.common.utils.excel.fieldtype.OfficeType;
@JoinTable(type=Type.LEFT_JOIN, entity=Company.class, alias="c",
on="c.company_code=e.company_code", attrName="employee.company",
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="公司代码"),
@@ -64,6 +70,8 @@ import com.jeesite.common.utils.excel.fieldtype.OfficeType;
@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="区域类型"),

7
modules/core/src/main/java/com/jeesite/modules/sys/entity/Employee.java
View File

@@ -12,6 +12,7 @@ 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,6 +40,8 @@ import com.jeesite.common.mybatis.mapper.query.QueryType;
@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="机构代码"),
@@ -54,6 +57,8 @@ import com.jeesite.common.mybatis.mapper.query.QueryType;
@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="公司代码"),
@@ -64,6 +69,8 @@ import com.jeesite.common.mybatis.mapper.query.QueryType;
@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="区域类型"),

5
modules/core/src/main/resources/views/themes/default/modules/sys/sysIndex/topMenu.html
View File

@@ -71,7 +71,10 @@
}
var li = $("#leftMenu-" + code + " > li");
if (!li.hasClass('menu-open')){
li = li.eq(0).find('> a').click();
li = li.eq(0).find('> a');
if (li.data('href') == 'blank'){
li.click();
}
}
}
window.initMenu = true;