diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java index c00b0b6..cec9914 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java @@ -13,10 +13,10 @@ public class ImppEnumUtil { /** * 组织类型 + * 1.集团,2.公司,3.工厂 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum ORGANIZE_YTPE{ -// 1.集团,2.公司,3.工厂 TYPE_GROUP(1,"集团","组织类型为集团"), TYPE_COMPANY(2,"公司","组织类型为公司"), TYPE_FACTORY(3,"工厂","组织类型为集团"), 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 df72a03..52baa47 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 @@ -17,21 +17,31 @@ import javax.persistence.Table; * @Modify: **/ @Entity -@Table(name="sys_user") +@Table(name="SYS_USER") @Data @Api(value="用户登陆表",description = "用户登陆系统账户。") public class SysUser extends BaseBean { - @Column(name="employee_id") + @Column(name="EMPLOYEE_ID") @ApiParam(value = "人员主键") private Long employeeId; - @Column(name="login_name") - @ApiParam(value = "登陆名",example = "前台显示的名称") + public long getEmployeeIdVal(){ + if(employeeId != null) { + return employeeId.longValue(); + }else{ + return employeeId; + } + } + + @Column(name="LOGIN_NAME") + @ApiParam(value = "登陆名") + //前台显示的名称 private String loginName; - @Column(name="login_pwd") - @ApiParam(value = "登陆密码",example = "使用浏览器语言代码,参考java.util.Locale中的代码。CN/zh,TW/zh,HK/zh,US/en, FR/en,GB/en,JP/en,DE/en,KR/en") + @Column(name="LOGIN_PWD") + @ApiParam(value = "登陆密码") + //使用浏览器语言代码,参考java.util.Locale中的代码。CN/zh,TW/zh,HK/zh,US/en, FR/en,GB/en,JP/en,DE/en,KR/en private String loginPwd; //@Column(name="login_pwd_salt")