升级fastjson为1.2.80,修复字典排序错误问题
This commit is contained in:
2
pom.xml
2
pom.xml
@ -38,7 +38,7 @@
|
|||||||
<java.version>1.8</java.version>
|
<java.version>1.8</java.version>
|
||||||
<jedis.version>3.3.0</jedis.version>
|
<jedis.version>3.3.0</jedis.version>
|
||||||
<swagger.version>3.0.0</swagger.version>
|
<swagger.version>3.0.0</swagger.version>
|
||||||
<fastjson.version>1.2.79</fastjson.version>
|
<fastjson.version>1.2.80</fastjson.version>
|
||||||
<druid.version>1.2.8</druid.version>
|
<druid.version>1.2.8</druid.version>
|
||||||
<hutool.version>5.5.7</hutool.version>
|
<hutool.version>5.5.7</hutool.version>
|
||||||
<poi.version>4.1.2</poi.version>
|
<poi.version>4.1.2</poi.version>
|
||||||
|
@ -52,7 +52,7 @@ public class DictDetailController {
|
|||||||
@ApiOperation("查询字典详情")
|
@ApiOperation("查询字典详情")
|
||||||
@GetMapping
|
@GetMapping
|
||||||
public ResponseEntity<Object> getDictDetails(DictDetailQueryCriteria criteria,
|
public ResponseEntity<Object> getDictDetails(DictDetailQueryCriteria criteria,
|
||||||
@PageableDefault(sort = {"sort"}, direction = Sort.Direction.ASC) Pageable pageable){
|
@PageableDefault(sort = {"sort + 0"}, direction = Sort.Direction.ASC) Pageable pageable){
|
||||||
return new ResponseEntity<>(dictDetailService.queryAll(criteria,pageable),HttpStatus.OK);
|
return new ResponseEntity<>(dictDetailService.queryAll(criteria,pageable),HttpStatus.OK);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -60,7 +60,7 @@ public class DictDetailController {
|
|||||||
@ApiOperation("查询多个字典详情")
|
@ApiOperation("查询多个字典详情")
|
||||||
@GetMapping(value = "/map")
|
@GetMapping(value = "/map")
|
||||||
public ResponseEntity<Object> getDictDetailMaps(DictDetailQueryCriteria criteria,
|
public ResponseEntity<Object> getDictDetailMaps(DictDetailQueryCriteria criteria,
|
||||||
@PageableDefault(sort = {"sort"}, direction = Sort.Direction.ASC) Pageable pageable){
|
@PageableDefault(sort = {"sort + 0"}, direction = Sort.Direction.ASC) Pageable pageable){
|
||||||
String[] names = criteria.getDictName().split(",");
|
String[] names = criteria.getDictName().split(",");
|
||||||
Map<String,Object> map = new HashMap<>(names.length);
|
Map<String,Object> map = new HashMap<>(names.length);
|
||||||
for (String name : names) {
|
for (String name : names) {
|
||||||
|
Reference in New Issue
Block a user