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

format code

Browse Source
This commit is contained in:
thinkgem
2024-03-22 14:40:40 +08:00
parent 45b8595122
commit 4df4f822bc
2 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -45,35 +45,35 @@ import jakarta.validation.Valid;
@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="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="邮箱"),
@Column(includeEntity=DataEntity.class),
@Column(includeEntity=TreeEntity.class),
@Column(name="office_code", label="机构编码", isPK=true),
@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="邮箱"),
}),
@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="view_code", label="公司代码"),
@Column(name="company_name", label="公司名称", isQuery=false),
@Column(name="full_name", label="公司全称"),
@Column(includeEntity=DataEntity.class),
@Column(includeEntity=TreeEntity.class),
@Column(name="company_code", label="公司编码", isPK=true),
@Column(name="view_code", label="公司代码"),
@Column(name="company_name", label="公司名称", isQuery=false),
@Column(name="full_name", label="公司全称"),
}),
@JoinTable(type=Type.LEFT_JOIN, entity=Area.class, alias="ar",
on="ar.area_code = c.area_code", attrName="employee.company.area",
columns={
@Column(name="area_code", label="区域代码", isPK=true),
@Column(name="area_name", label="区域名称", isQuery=false),
@Column(name="area_type", label="区域类型"),
@Column(name="area_code", label="区域代码", isPK=true),
@Column(name="area_name", label="区域名称", isQuery=false),
@Column(name="area_type", label="区域类型"),
}),
// @JoinTable(type=Type.LEFT_JOIN, entity=User.class, attrName="this", alias="u",
// on="u.user_code = a.create_by", columns={

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

@@ -18,12 +18,12 @@ import com.jeesite.common.mybatis.annotation.Table;
@Column(name="role_code", attrName="roleCode", label="角色编码", isPK=true),
@Column(name="post_code", attrName="postCode", label="岗位编码", isPK=true),
},
joinTable = {
joinTable={
@JoinTable(type=JoinTable.Type.LEFT_JOIN, entity=Role.class, alias="r", lazy = true,
on="a.role_code = r.role_code", attrName="role",
columns={
@Column(name="role_code", attrName="roleCode", label="角色编码", isPK=true),
@Column(name="role_name", attrName="roleName", label="角色名称"),
@Column(name="role_code", attrName="roleCode", label="角色编码", isPK=true),
@Column(name="role_name", attrName="roleName", label="角色名称"),
})
}, orderBy=""
)
@@ -33,7 +33,7 @@ public class PostRole extends DataEntity<PostRole> {
private String postCode; // 岗位编码
private String roleCode; // 角色编码
private Role role; // sqlMap().loadJoinTableAlias("r")的时候返回数据
private Role role; // sqlMap().loadJoinTableAlias("r") 的时候返回数据
public PostRole() {
this(null, null);