diff --git a/center.manager/src/main/java/com/lyms/cm/entity/sys/SysUsers.java b/center.manager/src/main/java/com/lyms/cm/entity/sys/SysUsers.java index 392c43e..93b1bf5 100644 --- a/center.manager/src/main/java/com/lyms/cm/entity/sys/SysUsers.java +++ b/center.manager/src/main/java/com/lyms/cm/entity/sys/SysUsers.java @@ -141,10 +141,6 @@ public class SysUsers implements Serializable { @TableField(value = "ENABLE") private Integer enable; - /** - * 测试 - */ - private SysRoles roles; public String getId() { return id; @@ -338,12 +334,5 @@ public class SysUsers implements Serializable { this.enable = enable; } - public SysRoles getRoles() { - return roles; - } - - public void setRoles(SysRoles roles) { - this.roles = roles; - } } diff --git a/core.sdk/src/main/java/com/lyms/web/controller/BaseController.java b/core.sdk/src/main/java/com/lyms/web/controller/BaseController.java index 3f101fe..7462e67 100644 --- a/core.sdk/src/main/java/com/lyms/web/controller/BaseController.java +++ b/core.sdk/src/main/java/com/lyms/web/controller/BaseController.java @@ -18,6 +18,8 @@ import org.springframework.beans.propertyeditors.CustomDateEditor; import org.springframework.util.StringUtils; import org.springframework.web.bind.ServletRequestDataBinder; import org.springframework.web.bind.annotation.InitBinder; +import org.springframework.web.context.request.RequestContextHolder; +import org.springframework.web.context.request.ServletRequestAttributes; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.serializer.SerializerFeature; @@ -110,6 +112,7 @@ public class BaseController { */ protected Page getPage(int size) { int _size = size, _index = 1; + request =((ServletRequestAttributes)RequestContextHolder.getRequestAttributes()).getRequest(); if (request.getParameter("_size") != null) { _size = Integer.parseInt(request.getParameter("_size")); }