From 7f5470c34aa4e2b56e020f83738dfb04a7b20e98 Mon Sep 17 00:00:00 2001 From: "wei.peng" Date: Thu, 29 Nov 2018 23:59:16 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMenu.java | 2 +- .../src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUser.java | 2 +- .../main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-) 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 754a668..55af110 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 @@ -68,7 +68,7 @@ public class SysMenu extends BaseBean { @Column(name="MENU_URL") @ApiParam(value ="资源 url" , access ="资源 url") private String menuUrl; - + @Column(name="MENU_CSS") @ApiParam(value ="资源css" , access ="资源css") private String menuCss; 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 9ab72fc..4641688 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 @@ -67,7 +67,7 @@ public class SysUser extends BaseBean { @ApiParam(value ="手机号" , access ="手机号") private String userPhone; - @Column(name="USER_STATUS_ID") + @Column(name="USER_STATUS") @ApiParam(value ="用户状态(枚举：1正常,2冻结使用,3账号异常,4离职，5服务到期)" , example ="-1") private Integer userStatus; diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java index 603a79a..61f9fb2 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java @@ -143,6 +143,7 @@ public class CoreHqlPack { // 查询参数封装 HqlPack.getNumEqualPack(menu.getParentId(),"parentId",result); + HqlPack.getNumEqualPack(menu.getMenuType(),"menuType",result); HqlPack.getNumEqualPack(menu.getMenuStatus(),"menuStatus",result); HqlPack.getStringLikerPack(menu.getName(),"name",result); HqlPack.getStringLikerPack(menu.getMenuCode(),"menuCode",result); @@ -313,6 +314,7 @@ public class CoreHqlPack { HqlPack.getNumEqualPack(user.getIsValid(),"isValid",result); HqlPack.getNumEqualPack(user.getDepartmentId(),"departmentId",result); HqlPack.getNumEqualPack(user.getRoleId(),"roleId",result); + HqlPack.getNumEqualPack(user.getUserStatus(),"userStatus",result); // And Like % % HqlPack.getStringLikerPack(user.getUserName(),"userName",result); HqlPack.getStringLikerPack(user.getUserLoginName(),"userLoginName",result);