From 06d7cf1c9fd0584727656c1dac58f41e86287b21 Mon Sep 17 00:00:00 2001 From: "wei.peng" Date: Mon, 29 Oct 2018 17:51:55 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E6=9D=83=E9=99=90=20?= =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/platform/bean/Position.java | 4 +++- .../main/java/cn/estsh/i3plus/pojo/platform/bean/RefUserRole.java | 4 +++- .../main/java/cn/estsh/i3plus/pojo/platform/bean/SessionUser.java | 5 +++++ .../src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMenu.java | 4 ++-- .../src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUser.java | 2 ++ 5 files changed, 15 insertions(+), 4 deletions(-) diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/Position.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/Position.java index 6896284..72135d4 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/Position.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/Position.java @@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.util.List; /** * @Description : 岗位 @@ -59,6 +60,7 @@ public class Position extends BaseBean { @ApiParam(value ="描述" , access ="描述") private String positionDescription; - + @ApiParam(value ="子部门列表") + private transient List childList; } diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/RefUserRole.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/RefUserRole.java index 449ec90..750c17a 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/RefUserRole.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/RefUserRole.java @@ -29,7 +29,9 @@ import java.text.DecimalFormat; @Api(value="关系-用户角色",description = "关系-用户角色") public class RefUserRole extends BaseBean { - + private static final long serialVersionUID = 1L; + + @Column(name="USER_ID") @ApiParam(value ="用户ID" , example = "0") @JsonSerialize(using = ToStringSerializer.class) diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SessionUser.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SessionUser.java index 8f922de..fb518a1 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SessionUser.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SessionUser.java @@ -16,6 +16,8 @@ import java.util.List; @Data public class SessionUser implements Serializable { + private static final long serialVersionUID = 1L; + @ApiParam("用户工号") private String userCode; @@ -47,6 +49,9 @@ public class SessionUser implements Serializable { @ApiParam(value = "组织信息",access = "用户所拥有的组织信息集合") private Organize organize; + @ApiParam(value = "岗位信息",access = "用户主岗位信息") + private Position position; + public SessionUser() { } diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMenu.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMenu.java index 0db5955..48a70fd 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMenu.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMenu.java @@ -31,11 +31,11 @@ public class SysMenu extends BaseBean { @Column(name="NAME") - @ApiParam(value ="功能名称" , access ="功能名称") + @ApiParam(value ="功能名称" , access ="功能名称", required =true) private String name; @Column(name="MENU_TYPE_ID") - @ApiParam(value ="功能类型（1.模块，2.菜单，3.按钮）" , example ="1" , access ="功能类型（1.模块，2.菜单，3.按钮）") + @ApiParam(value ="功能类型（1.模块，2.菜单，3.按钮）" , example ="1" , access ="功能类型（1.模块，2.菜单，3.按钮）", required = true) private Integer menuTypeId; @Column(name="PARENT_ID") diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUser.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUser.java index 1821328..1ec9ced 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUser.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUser.java @@ -25,6 +25,8 @@ import java.util.List; @Api(value="用户登陆表",description = "用户登陆系统账户。") public class SysUser extends BaseBean { + private static final long serialVersionUID = 1L; + @Column(name="NAME") @ApiParam(value ="名称" , access ="名称") private String name;