jiangjiazhi / center

Download as
Browse Code »

Commit abb14ac43659eeaa855d67fb771cb7dd3936ebc8

Authored by maliang
2 parents 41d942a9e0 c1185ea1e0
Exists in master

Merge branch 'master' of https://git.healthbaby.com.cn/jiangjiazhi/center

Showing 2 changed files

center.manager/src/main/java/com/lyms/cm/entity/sys/SysUsers.java View file @ abb14ac
... ... @@ -141,10 +141,6 @@
141 141 @TableField(value = "ENABLE")
142 142 private Integer enable;
143 143  
144   - /**
145   - * 测试
146   - */
147   - private SysRoles roles;
148 144  
149 145 public String getId() {
150 146 return id;
... ... @@ -338,13 +334,6 @@
338 334 this.enable = enable;
339 335 }
340 336  
341   - public SysRoles getRoles() {
342   - return roles;
343   - }
344   -
345   - public void setRoles(SysRoles roles) {
346   - this.roles = roles;
347   - }
348 337  
349 338 }
core.sdk/src/main/java/com/lyms/web/controller/BaseController.java View file @ abb14ac
... ... @@ -19,6 +19,8 @@
19 19 import org.springframework.util.StringUtils;
20 20 import org.springframework.web.bind.ServletRequestDataBinder;
21 21 import org.springframework.web.bind.annotation.InitBinder;
  22 +import org.springframework.web.context.request.RequestContextHolder;
  23 +import org.springframework.web.context.request.ServletRequestAttributes;
22 24  
23 25 import com.alibaba.fastjson.JSON;
24 26 import com.alibaba.fastjson.serializer.SerializerFeature;
... ... @@ -111,6 +113,7 @@
111 113 */
112 114 protected <T> Page<T> getPage(int size) {
113 115 int _size = size, _index = 1;
  116 + request =((ServletRequestAttributes)RequestContextHolder.getRequestAttributes()).getRequest();
114 117 if (request.getParameter("_size") != null) {
115 118 _size = Integer.parseInt(request.getParameter("_size"));
116 119 }