Commit 76a2023514d98d81dd57f679d119f432aeb59d11
1 parent
6c867d27
list 方法问题解决
Showing
3 changed files
with
11 additions
and
1 deletions
src/main/java/com/bsth/controller/BaseController.java
| @@ -2,6 +2,7 @@ package com.bsth.controller; | @@ -2,6 +2,7 @@ package com.bsth.controller; | ||
| 2 | 2 | ||
| 3 | import com.bsth.service.BaseService; | 3 | import com.bsth.service.BaseService; |
| 4 | import com.google.common.base.Splitter; | 4 | import com.google.common.base.Splitter; |
| 5 | +import org.apache.commons.lang3.StringUtils; | ||
| 5 | import org.springframework.beans.factory.annotation.Autowired; | 6 | import org.springframework.beans.factory.annotation.Autowired; |
| 6 | import org.springframework.data.domain.Page; | 7 | import org.springframework.data.domain.Page; |
| 7 | import org.springframework.data.domain.PageRequest; | 8 | import org.springframework.data.domain.PageRequest; |
| @@ -47,7 +48,11 @@ public class BaseController<T, ID extends Serializable> { | @@ -47,7 +48,11 @@ public class BaseController<T, ID extends Serializable> { | ||
| 47 | 48 | ||
| 48 | // 允许多个字段排序，order可以写单个字段，也可以写多个字段 | 49 | // 允许多个字段排序，order可以写单个字段，也可以写多个字段 |
| 49 | // 多个字段格式：{col1},{col2},{col3},....,{coln} | 50 | // 多个字段格式：{col1},{col2},{col3},....,{coln} |
| 50 | - List<String> order_columns = Splitter.on(",").trimResults().splitToList(order); | 51 | + if(StringUtils.isBlank(order)){ |
| 52 | + order = map.get("order").toString(); | ||
| 53 | + direction = map.get("direction").toString(); | ||
| 54 | + } | ||
| 55 | + List<String> order_columns = Splitter.on(",").trimResults().splitToList(order); | ||
| 51 | // 多字段排序：DESC,ASC... | 56 | // 多字段排序：DESC,ASC... |
| 52 | List<String> order_dirs = Splitter.on(",").trimResults().splitToList(direction); | 57 | List<String> order_dirs = Splitter.on(",").trimResults().splitToList(direction); |
| 53 | 58 |
src/main/java/com/bsth/controller/schedule/BController.java
| @@ -100,6 +100,10 @@ public class BController<T, ID extends Serializable> { | @@ -100,6 +100,10 @@ public class BController<T, ID extends Serializable> { | ||
| 100 | @RequestParam(defaultValue = "DESC") String direction) { | 100 | @RequestParam(defaultValue = "DESC") String direction) { |
| 101 | // 允许多个字段排序，order可以写单个字段，也可以写多个字段 | 101 | // 允许多个字段排序，order可以写单个字段，也可以写多个字段 |
| 102 | // 多个字段格式：{col1},{col2},{col3},....,{coln} | 102 | // 多个字段格式：{col1},{col2},{col3},....,{coln} |
| 103 | + if(StringUtils.isBlank(order)){ | ||
| 104 | + order = map.get("order").toString(); | ||
| 105 | + direction = map.get("direction").toString(); | ||
| 106 | + } | ||
| 103 | List<String> order_columns = Splitter.on(",").trimResults().splitToList(order); | 107 | List<String> order_columns = Splitter.on(",").trimResults().splitToList(order); |
| 104 | // 多字段排序：DESC,ASC... | 108 | // 多字段排序：DESC,ASC... |
| 105 | List<String> order_dirs = Splitter.on(",").trimResults().splitToList(direction); | 109 | List<String> order_dirs = Splitter.on(",").trimResults().splitToList(direction); |
src/main/resources/static/pages/permission/resource/list.html
| @@ -219,6 +219,7 @@ $(function(){ | @@ -219,6 +219,7 @@ $(function(){ | ||
| 219 | params = p; | 219 | params = p; |
| 220 | //更新时间排序 | 220 | //更新时间排序 |
| 221 | params['order'] = 'updateDate'; | 221 | params['order'] = 'updateDate'; |
| 222 | + params['direction'] = 'ASC'; | ||
| 222 | params['page'] = page; | 223 | params['page'] = page; |
| 223 | var i = layer.load(2); | 224 | var i = layer.load(2); |
| 224 | $get('/resource' ,params, function(data){ | 225 | $get('/resource' ,params, function(data){ |